Make ICANN reporting not fail on success upload (#791)

* Make ICANN reporting not fail on success upload

According to the spec
(https://tools.ietf.org/html/draft-lozano-icann-registry-interfaces-13#page-16),
when an upload succeeds (HTTP response code 200), the result code
contained in the response message is always 1000 (success). So there is
no need to parse the response content and check the result code. Given
that we are having a problem parsing the response content due to encoding,
it is best that we don't check it so as to not get false negative
alerts when the upload is successful.

The current logic also has a bug: HttpRequest.execute() will by default
throw when the response code is non-20X. Therefore for a 400 response,
our parsing logic never runs on it. Coincidentally, this month when we
uploaded the July activity report (due to stale cursors), we get 400
responses (due to existing reports on the ICANN servers). The stack
trace printed for the thrown exceptions from the 400 responses contained
correctly parsed response contents. This lead us to believe that the issue with
encoding was transient last month. However when we tried again to upload this
month's report, our parser failed again (because the response code was 200 this
time, and our parser actually ran on the response contents).

This seems to suggest that ICANN is sending back readable response
contents, but our parser somehow failed to understand it, assuming that
ICANN is using the same encoding for 200 (which we tried and failed to
parse) and 400 response contents (which caused an exception and was printed
corrected in the stack trace).

This PR changed the transport behavior so that it doesn't throw
automatically for non-20X responses. We will print the content for both
200 and 400 responses, but only try to parse 400 response content. We
put the 400 response in an HttpResponseException and print stack trace
from it, which should display the content correctly so that we can
compare it with the result of our own parsing.

* Add tests

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

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']
@@ -633,131 +633,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 +752,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 +886,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,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
@@ -220,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
@@ -240,7 +246,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,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
@@ -237,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/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,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/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,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/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,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/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,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
@@ -237,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/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,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
@@ -226,7 +230,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 +296,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,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
@@ -226,7 +230,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 +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/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/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/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/spec11/Spec11Pipeline.java

@@ -89,6 +89,7 @@ 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;
@@ -99,6 +100,7 @@ public class Spec11Pipeline implements Serializable {
   @Inject
   public Spec11Pipeline(
       @Config("projectId") String projectId,
+      @Config("defaultJobRegion") String beamJobRegion,
       @Config("beamStagingUrl") String beamStagingUrl,
       @Config("spec11TemplateUrl") String spec11TemplateUrl,
       @Config("reportingBucketUrl") String reportingBucketUrl,
@@ -106,6 +108,7 @@ public class Spec11Pipeline implements Serializable {
       @LocalCredential GoogleCredentialsBundle googleCredentialsBundle,
       Retrier retrier) {
     this.projectId = projectId;
+    this.beamJobRegion = beamJobRegion;
     this.beamStagingUrl = beamStagingUrl;
     this.spec11TemplateUrl = spec11TemplateUrl;
     this.reportingBucketUrl = reportingBucketUrl;
@@ -146,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);

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/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/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/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/billing/BillingEvent.java

@@ -347,27 +347,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
@@ -505,21 +489,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
@@ -639,21 +613,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
@@ -733,21 +697,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,11 +15,17 @@
 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 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;
 
 /**
  * A persisted history entry representing an EPP modification to a contact.
@@ -36,6 +42,8 @@ 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;
@@ -43,6 +51,15 @@ public class ContactHistory extends HistoryEntry {
   @Column(nullable = false)
   VKey<ContactResource> contactRepoId;
 
+  @Id
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "HistorySequenceGenerator")
+  @Column(name = "historyRevisionId")
+  @Access(AccessType.PROPERTY)
+  @Override
+  public long getId() {
+    return super.getId();
+  }
+
   /** The state of the {@link ContactBase} object at this point in time. */
   public ContactBase getContactBase() {
     return contactBase;
@@ -81,7 +98,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

@@ -15,7 +15,6 @@
 package google.registry.model.domain;
 
 import com.googlecode.objectify.Key;
-import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.EppResource;
 import google.registry.model.EppResource.ForeignKeyedEppResource;
 import google.registry.model.annotations.ExternalMessagingName;
@@ -27,9 +26,16 @@ import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.Set;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 import org.joda.time.DateTime;
 
 /**
@@ -42,16 +48,17 @@ import org.joda.time.DateTime;
  * @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")
@@ -74,6 +81,31 @@ public class DomainBase extends DomainContent
     return super.nsHosts;
   }
 
+  /**
+   * Returns the set of {@link GracePeriod} associated with the domain.
+   *
+   * <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>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.
+   */
+  @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
   public VKey<DomainBase> createVKey() {
     return VKey.create(DomainBase.class, getRepoId(), Key.create(this));
@@ -84,7 +116,7 @@ public class DomainBase extends DomainContent
     return cloneDomainProjectedAtTime(this, now);
   }
 
-  public static VKey<DomainBase> createVKey(Key key) {
+  public static VKey<DomainBase> createVKey(Key<DomainBase> key) {
     return VKey.create(DomainBase.class, key.getName(), key);
   }
 

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

@@ -40,7 +40,6 @@ 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.Key;
 import com.googlecode.objectify.annotation.Ignore;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.annotation.Index;
@@ -73,7 +72,6 @@ import javax.persistence.AccessType;
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
-import javax.persistence.ElementCollection;
 import javax.persistence.Embeddable;
 import javax.persistence.Embedded;
 import javax.persistence.MappedSuperclass;
@@ -234,7 +232,7 @@ public class DomainContent extends EppResource
   VKey<PollMessage.Autorenew> autorenewPollMessage;
 
   /** The unexpired grace periods for this domain (some of which may not be active yet). */
-  @Transient @ElementCollection Set<GracePeriod> gracePeriods;
+  @Transient Set<GracePeriod> gracePeriods;
 
   /**
    * The id of the signed mark that was used to create this domain in sunrise.
@@ -254,19 +252,44 @@ public class DomainContent extends EppResource
    */
   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(contact -> contact.reconstitute()).collect(toImmutableSet());
+        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<DesignatedContact>();
+    ImmutableSet.Builder<DesignatedContact> contactsBuilder = new ImmutableSet.Builder<>();
 
     if (registrantContact != null) {
       contactsBuilder.add(
@@ -313,6 +336,10 @@ public class DomainContent extends EppResource
     return smdId;
   }
 
+  public Optional<DateTime> getAutorenewEndTime() {
+    return Optional.ofNullable(autorenewEndTime);
+  }
+
   @Override
   public DomainTransferData getTransferData() {
     return Optional.ofNullable(transferData).orElse(DomainTransferData.EMPTY);
@@ -351,7 +378,13 @@ public class DomainContent extends EppResource
   // 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 = 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() {
@@ -402,7 +435,7 @@ public class DomainContent extends EppResource
    * parallels the logic in {@code DomainTransferApproveFlow} which handles explicit client
    * approvals.
    */
-  protected static <T extends DomainContent> T cloneDomainProjectedAtTime(T domain, DateTime now) {
+  static <T extends DomainContent> T cloneDomainProjectedAtTime(T domain, DateTime now) {
     DomainTransferData transferData = domain.getTransferData();
     DateTime transferExpirationTime = transferData.getPendingTransferExpirationTime();
 
@@ -448,6 +481,7 @@ public class DomainContent extends EppResource
             ImmutableSet.of(
                 GracePeriod.create(
                     GracePeriodStatus.TRANSFER,
+                    domain.getRepoId(),
                     transferExpirationTime.plus(
                         Registry.get(domain.getTld()).getTransferGracePeriodLength()),
                     transferData.getGainingClientId(),
@@ -483,6 +517,7 @@ public class DomainContent extends EppResource
           .addGracePeriod(
               GracePeriod.createForRecurring(
                   GracePeriodStatus.AUTO_RENEW,
+                  domain.getRepoId(),
                   lastAutorenewTime.plus(
                       Registry.get(domain.getTld()).getAutoRenewGracePeriodLength()),
                   domain.getCurrentSponsorClientId(),
@@ -534,8 +569,10 @@ public class DomainContent extends EppResource
 
   /** 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()
+    return ofy()
+        .load()
+        .keys(getNameservers().stream().map(VKey::getOfyKey).collect(toImmutableSet()))
+        .values()
         .stream()
         .map(HostResource::getHostName)
         .collect(toImmutableSortedSet(Ordering.natural()));
@@ -587,7 +624,7 @@ public class DomainContent extends EppResource
    * <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.
    */
-  protected void setContactFields(Set<DesignatedContact> contacts, boolean includeRegistrant) {
+  void setContactFields(Set<DesignatedContact> contacts, boolean includeRegistrant) {
     // Set the individual contact fields.
     for (DesignatedContact contact : contacts) {
       switch (contact.getType()) {
@@ -613,15 +650,13 @@ public class DomainContent extends EppResource
 
   @Override
   public VKey<DomainBase> createVKey() {
-    return VKey.create(DomainBase.class, getRepoId(), Key.create(this));
-  }
-
-  public static VKey<DomainBase> createVKey(Key key) {
-    return VKey.create(DomainBase.class, key.getName(), key);
+    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. */
-  protected static final Predicate<DesignatedContact> IS_REGISTRANT =
+  static final Predicate<DesignatedContact> IS_REGISTRANT =
       (DesignatedContact contact) -> DesignatedContact.Type.REGISTRANT.equals(contact.type);
 
   /** An override of {@link EppResource#asBuilder} with tighter typing. */
@@ -661,7 +696,13 @@ public class DomainContent extends EppResource
       }
       checkArgumentNotNull(instance.getRegistrant(), "Missing registrant");
       instance.tld = getTldFromDomainName(instance.fullyQualifiedDomainName);
-      return super.build();
+
+      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) {
@@ -817,6 +858,11 @@ public class DomainContent extends EppResource
       return thisCastToDerived();
     }
 
+    public B setAutorenewEndTime(Optional<DateTime> autorenewEndTime) {
+      getInstance().autorenewEndTime = autorenewEndTime.orElse(null);
+      return thisCastToDerived();
+    }
+
     @Override
     public B setTransferData(DomainTransferData transferData) {
       getInstance().transferData = transferData;

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

@@ -14,19 +14,32 @@
 
 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.contact.ContactResource;
+import google.registry.model.ImmutableObject;
+import google.registry.model.domain.DomainHistory.DomainHistoryId;
 import google.registry.model.host.HostResource;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
+import java.io.Serializable;
 import java.util.Set;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 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.JoinTable;
+import javax.persistence.PostLoad;
+import javax.persistence.Table;
 
 /**
  * A persisted history entry representing an EPP modification to a domain.
@@ -36,26 +49,43 @@ import javax.persistence.JoinTable;
  * the foreign-keyed fields in that class can refer to this object.
  */
 @Entity
-@javax.persistence.Table(
+@Table(
     indexes = {
-        @javax.persistence.Index(columnList = "creationTime"),
-        @javax.persistence.Index(columnList = "historyRegistrarId"),
-        @javax.persistence.Index(columnList = "historyType"),
-        @javax.persistence.Index(columnList = "historyModificationTime")
+      @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
   DomainContent domainContent;
 
-  @Column(nullable = false)
-  VKey<DomainBase> domainRepoId;
+  @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")
-  @Access(AccessType.PROPERTY)
   @Column(name = "host_repo_id")
+  Set<VKey<HostResource>> nsHosts;
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "HistorySequenceGenerator")
+  @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 domainContent.nsHosts;
+    return nsHosts;
   }
 
   /** The state of the {@link DomainContent} object at this point in time. */
@@ -63,16 +93,51 @@ public class DomainHistory extends HistoryEntry {
     return domainContent;
   }
 
-  /** The key to the {@link ContactResource} this is based off of. */
+  /** The key to the {@link DomainBase} this is based off of. */
   public VKey<DomainBase> getDomainRepoId() {
-    return domainRepoId;
+    return VKey.create(DomainBase.class, domainRepoId, Key.create(DomainBase.class, domainRepoId));
   }
 
-  // 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) {
+  public VKey<DomainHistory> createVKey() {
+    return VKey.createSql(DomainHistory.class, new DomainHistoryId(domainRepoId, getId()));
+  }
+
+  @PostLoad
+  void postLoad() {
     if (domainContent != null) {
-      domainContent.nsHosts = nsHosts;
+      domainContent.nsHosts = nullToEmptyImmutableCopy(nsHosts);
+    }
+  }
+
+  /** 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;
     }
   }
 
@@ -91,12 +156,15 @@ public class DomainHistory extends HistoryEntry {
 
     public Builder setDomainContent(DomainContent domainContent) {
       getInstance().domainContent = domainContent;
+      if (domainContent != null) {
+        getInstance().nsHosts = nullToEmptyImmutableCopy(domainContent.nsHosts);
+      }
       return this;
     }
 
-    public Builder setDomainRepoId(VKey<DomainBase> domainRepoId) {
+    public Builder setDomainRepoId(String domainRepoId) {
       getInstance().domainRepoId = domainRepoId;
-      domainRepoId.maybeGetOfyKey().ifPresent(parent -> getInstance().parent = parent);
+      getInstance().parent = Key.create(DomainBase.class, domainRepoId);
       return this;
     }
 
@@ -104,7 +172,7 @@ public class DomainHistory extends HistoryEntry {
     @Override
     public Builder setParent(Key<? extends EppResource> parent) {
       super.setParent(parent);
-      getInstance().domainRepoId = VKey.create(DomainBase.class, parent.getName(), 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/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,17 @@
 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 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;
 
 /**
  * A persisted history entry representing an EPP modification to a host.
@@ -37,6 +43,8 @@ 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
@@ -45,6 +53,15 @@ public class HostHistory extends HistoryEntry {
   @Column(nullable = false)
   VKey<HostResource> hostRepoId;
 
+  @Id
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "HistorySequenceGenerator")
+  @Column(name = "historyRevisionId")
+  @Access(AccessType.PROPERTY)
+  @Override
+  public long getId() {
+    return super.getId();
+  }
+
   /** The state of the {@link HostBase} object at this point in time. */
   public HostBase getHostBase() {
     return hostBase;
@@ -83,7 +100,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/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}. */
@@ -99,8 +102,7 @@ public class DatastoreTransactionManager implements TransactionManager {
 
   @Override
   public void saveNew(Object entity) {
-    checkArgumentNotNull(entity, "entity must be specified");
-    getOfy().save().entity(entity);
+    saveEntity(entity);
   }
 
   @Override
@@ -110,8 +112,7 @@ public class DatastoreTransactionManager implements TransactionManager {
 
   @Override
   public void saveNewOrUpdate(Object entity) {
-    checkArgumentNotNull(entity, "entity must be specified");
-    getOfy().save().entity(entity);
+    saveEntity(entity);
   }
 
   @Override
@@ -121,8 +122,7 @@ public class DatastoreTransactionManager implements TransactionManager {
 
   @Override
   public void update(Object entity) {
-    checkArgumentNotNull(entity, "entity must be specified");
-    getOfy().save().entity(entity);
+    saveEntity(entity);
   }
 
   @Override
@@ -137,7 +137,7 @@ public class DatastoreTransactionManager implements TransactionManager {
 
   @Override
   public <T> boolean checkExists(VKey<T> key) {
-    return getOfy().load().key(key.getOfyKey()).now() != null;
+    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

@@ -155,15 +155,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 +301,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 +402,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/reporting/HistoryEntry.java

@@ -14,8 +14,10 @@
 
 package google.registry.model.reporting;
 
+import static com.googlecode.objectify.Key.getKind;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
@@ -28,20 +30,26 @@ import google.registry.model.Buildable;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.ReportedOn;
+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.Period;
 import google.registry.model.eppcommon.Trid;
+import google.registry.model.host.HostHistory;
+import google.registry.model.host.HostResource;
 import google.registry.persistence.VKey;
+import google.registry.persistence.WithStringVKey;
 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.Column;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.MappedSuperclass;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Transient;
 import org.joda.time.DateTime;
 
@@ -49,6 +57,8 @@ import org.joda.time.DateTime;
 @ReportedOn
 @Entity
 @MappedSuperclass
+@WithStringVKey // TODO(b/162229294): This should be resolved during the course of that bug
+@Access(AccessType.FIELD)
 public class HistoryEntry extends ImmutableObject implements Buildable {
 
   /** Represents the type of history entry. */
@@ -100,16 +110,13 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
     SYNTHETIC
   }
 
-  /** The autogenerated id of this event. */
-  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "HistorySequenceGenerator")
-  @SequenceGenerator(
-      name = "HistorySequenceGenerator",
-      sequenceName = "history_id_sequence",
-      allocationSize = 1)
-  @Id
-  @javax.persistence.Id
-  @Column(name = "historyRevisionId")
-  Long id;
+  /**
+   * The autogenerated id of this event. Note that, this field is marked as {@link Transient} in the
+   * SQL schema, this is because the child class of {@link HistoryEntry}, e.g. {@link
+   * DomainHistory}, uses a composite primary key which the id is part of, and Hibernate requires
+   * that all the {@link javax.persistence.Id} fields must be put in the exact same class.
+   */
+  @Id @Transient @VisibleForTesting public Long id;
 
   /** The resource this event mutated. */
   @Parent @Transient protected Key<? extends EppResource> parent;
@@ -185,8 +192,17 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
   @Transient // domain-specific
   Set<DomainTransactionRecord> domainTransactionRecords;
 
-  public Long getId() {
-    return id;
+  public long getId() {
+    // For some reason, Hibernate throws NPE during some initialization phase if we don't deal with
+    // the null case. Setting the id to 0L when it is null should be fine because 0L for primitive
+    // type is considered as null for wrapper class in the Hibernate context.
+    return id == null ? 0L : id;
+  }
+
+  // This method is required by Hibernate.
+  @SuppressWarnings("UnusedMethod")
+  private void setId(long id) {
+    this.id = id;
   }
 
   public Key<? extends EppResource> getParent() {
@@ -257,6 +273,40 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
     return new Builder(clone(this));
   }
 
+  public HistoryEntry asHistoryEntry() {
+    return new Builder().copyFrom(this).build();
+  }
+
+  @SuppressWarnings("unchecked")
+  public HistoryEntry toChildHistoryEntity() {
+    String parentKind = getParent().getKind();
+    final HistoryEntry resultEntity;
+    // can't use a switch statement since we're calling getKind()
+    if (parentKind.equals(getKind(DomainBase.class))) {
+      resultEntity =
+          new DomainHistory.Builder().copyFrom(this).setDomainRepoId(parent.getName()).build();
+    } else if (parentKind.equals(getKind(HostResource.class))) {
+      resultEntity =
+          new HostHistory.Builder()
+              .copyFrom(this)
+              .setHostRepoId(
+                  VKey.create(HostResource.class, parent.getName(), (Key<HostResource>) parent))
+              .build();
+    } else if (parentKind.equals(getKind(ContactResource.class))) {
+      resultEntity =
+          new ContactHistory.Builder()
+              .copyFrom(this)
+              .setContactRepoId(
+                  VKey.create(
+                      ContactResource.class, parent.getName(), (Key<ContactResource>) parent))
+              .build();
+    } else {
+      throw new IllegalStateException(
+          String.format("Unknown kind of HistoryEntry parent %s", parentKind));
+    }
+    return resultEntity;
+  }
+
   /** A builder for {@link HistoryEntry} since it is immutable */
   public static class Builder<T extends HistoryEntry, B extends Builder<?, ?>>
       extends GenericBuilder<T, B> {
@@ -266,11 +316,35 @@ public class HistoryEntry extends ImmutableObject implements Buildable {
       super(instance);
     }
 
+    // Used to fill out the fields in this object from an object which may not be exactly the same
+    // as the class T, where both classes still subclass HistoryEntry
+    public B copyFrom(HistoryEntry historyEntry) {
+      setId(historyEntry.id);
+      setParent(historyEntry.parent);
+      setType(historyEntry.type);
+      setPeriod(historyEntry.period);
+      setXmlBytes(historyEntry.xmlBytes);
+      setModificationTime(historyEntry.modificationTime);
+      setClientId(historyEntry.clientId);
+      setOtherClientId(historyEntry.otherClientId);
+      setTrid(historyEntry.trid);
+      setBySuperuser(historyEntry.bySuperuser);
+      setReason(historyEntry.reason);
+      setRequestedByRegistrar(historyEntry.requestedByRegistrar);
+      setDomainTransactionRecords(nullToEmptyImmutableCopy(historyEntry.domainTransactionRecords));
+      return thisCastToDerived();
+    }
+
     @Override
     public T build() {
       return super.build();
     }
 
+    public B setId(long id) {
+      getInstance().id = id;
+      return thisCastToDerived();
+    }
+
     public B setParent(EppResource parent) {
       getInstance().parent = Key.create(parent);
       return thisCastToDerived();

core/src/main/java/google/registry/model/reporting/Spec11ThreatMatchDao.java

@@ -0,0 +1,52 @@
+// 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.reporting;
+
+import com.google.common.collect.ImmutableList;
+import google.registry.persistence.transaction.JpaTransactionManager;
+import org.joda.time.LocalDate;
+
+/**
+ * Data access object for {@link google.registry.model.reporting.Spec11ThreatMatch}.
+ *
+ * <p>A JpaTransactionManager is passed into each static method because they are called from a BEAM
+ * pipeline and we don't know where it's coming from.</p>
+ */
+public class Spec11ThreatMatchDao {
+  
+  /** Delete all entries with the specified date from the database. */
+  public static void deleteEntriesByDate(JpaTransactionManager jpaTm, LocalDate date) {
+    jpaTm.assertInTransaction();
+    jpaTm
+        .getEntityManager()
+        .createQuery("DELETE FROM Spec11ThreatMatch WHERE check_date = :date")
+        .setParameter("date", date.toString())
+        .executeUpdate();
+  }
+
+  /** Query the database and return a list of domain names with the specified date. */
+  public static ImmutableList<Spec11ThreatMatch> loadEntriesByDate(
+      JpaTransactionManager jpaTm, LocalDate date) {
+    jpaTm.assertInTransaction();
+    return ImmutableList.copyOf(
+        jpaTm
+            .getEntityManager()
+            .createQuery(
+                "SELECT match FROM Spec11ThreatMatch match WHERE match.checkDate = :date",
+                Spec11ThreatMatch.class)
+            .setParameter("date", date)
+            .getResultList());
+  }
+}

core/src/main/java/google/registry/model/tmch/ClaimsListDao.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package google.registry.schema.tmch;
+package google.registry.model.tmch;
 
 import static google.registry.config.RegistryConfig.getDomainLabelListCacheDuration;
 import static google.registry.model.CacheUtils.tryMemoizeWithExpiration;
@@ -24,28 +24,28 @@ import google.registry.util.NonFinalForTesting;
 import java.util.Optional;
 import javax.persistence.EntityManager;
 
-/** Data access object for {@link ClaimsList}. */
+/** Data access object for {@link ClaimsListShard}. */
 public class ClaimsListDao {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
   /** In-memory cache for claims list. */
   @NonFinalForTesting
-  private static Supplier<Optional<ClaimsList>> cacheClaimsList =
+  private static Supplier<Optional<ClaimsListShard>> cacheClaimsList =
       tryMemoizeWithExpiration(getDomainLabelListCacheDuration(), ClaimsListDao::getLatestRevision);
 
-  private static void save(ClaimsList claimsList) {
+  private static void save(ClaimsListShard claimsList) {
     jpaTm().transact(() -> jpaTm().getEntityManager().persist(claimsList));
   }
 
   /**
-   * Try to save the given {@link ClaimsList} into Cloud SQL. If the save fails, the error will be
-   * logged but no exception will be thrown.
+   * Try to save the given {@link ClaimsListShard} into Cloud SQL. If the save fails, the error will
+   * be logged but no exception will be thrown.
    *
    * <p>This method is used during the dual-write phase of database migration as Datastore is still
    * the authoritative database.
    */
-  public static void trySave(ClaimsList claimsList) {
+  static void trySave(ClaimsListShard claimsList) {
     try {
       ClaimsListDao.save(claimsList);
       logger.atInfo().log(
@@ -57,12 +57,12 @@ public class ClaimsListDao {
   }
 
   /**
-   * Returns the most recent revision of the {@link ClaimsList} in Cloud SQL, if it exists.
+   * Returns the most recent revision of the {@link ClaimsListShard} in Cloud SQL, if it exists.
    * TODO(shicong): Change this method to package level access after dual-read phase.
    * ClaimsListShard uses this method to retrieve claims list in Cloud SQL for the comparison, and
    * ClaimsListShard is not in this package.
    */
-  public static Optional<ClaimsList> getLatestRevision() {
+  public static Optional<ClaimsListShard> getLatestRevision() {
     return jpaTm()
         .transact(
             () -> {
@@ -73,15 +73,15 @@ public class ClaimsListDao {
               return em.createQuery(
                       "FROM ClaimsList cl LEFT JOIN FETCH cl.labelsToKeys WHERE cl.revisionId ="
                           + " :revisionId",
-                      ClaimsList.class)
+                      ClaimsListShard.class)
                   .setParameter("revisionId", revisionId)
                   .getResultStream()
                   .findFirst();
             });
   }
 
-  /** Returns the most recent revision of the {@link ClaimsList}, from cache. */
-  public static Optional<ClaimsList> getLatestRevisionCached() {
+  /** Returns the most recent revision of the {@link ClaimsListShard}, from cache. */
+  public static Optional<ClaimsListShard> getLatestRevisionCached() {
     return cacheClaimsList.get();
   }
 

core/src/main/java/google/registry/model/tmch/ClaimsListShard.java

@@ -40,6 +40,7 @@ import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Ignore;
 import com.googlecode.objectify.annotation.OnSave;
 import com.googlecode.objectify.annotation.Parent;
+import google.registry.model.CreateAutoTimestamp;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
@@ -47,8 +48,6 @@ import google.registry.model.annotations.VirtualEntity;
 import google.registry.model.common.CrossTldSingleton;
 import google.registry.schema.replay.DatastoreEntity;
 import google.registry.schema.replay.SqlEntity;
-import google.registry.schema.tmch.ClaimsList;
-import google.registry.schema.tmch.ClaimsListDao;
 import google.registry.util.CollectionUtils;
 import google.registry.util.Concurrent;
 import google.registry.util.Retrier;
@@ -59,6 +58,15 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import javax.annotation.Nullable;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.JoinColumn;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import org.joda.time.DateTime;
 
 /**
@@ -74,10 +82,21 @@ import org.joda.time.DateTime;
  * 10MB per transaction limit.
  *
  * <p>Therefore, it is never OK to save an instance of this class directly to Datastore. Instead you
- * must use the {@link #save} method to do it for you.
+ * must use the {@link #saveToDatastore} method to do it for you.
+ *
+ * <p>Note that the primary key of this entity is {@link #revisionId}, which is auto-generated by
+ * the database. So, if a retry of insertion happens after the previous attempt unexpectedly
+ * succeeds, we will end up with having two exact same claims list with only different {@link
+ * #revisionId}. However, this is not an actual problem because we only use the claims list with
+ * highest {@link #revisionId}.
+ *
+ * <p>TODO(b/162007765): Rename the class to ClaimsList and remove Datastore related fields and
+ * methods.
  */
 @Entity
 @NotBackedUp(reason = Reason.EXTERNALLY_SOURCED)
+@javax.persistence.Entity(name = "ClaimsList")
+@Table
 public class ClaimsListShard extends ImmutableObject implements DatastoreEntity {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@@ -85,22 +104,44 @@ public class ClaimsListShard extends ImmutableObject implements DatastoreEntity
   /** The number of claims list entries to store per shard. */
   private static final int SHARD_SIZE = 10000;
 
-  @Id
-  long id;
+  @Transient @Id long id;
 
-  @Parent
-  Key<ClaimsListRevision> parent;
+  @Transient @Parent Key<ClaimsListRevision> parent;
 
-  /** When the claims list was last updated. */
+  @Ignore
+  @javax.persistence.Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  Long revisionId;
+
+  @Ignore
+  @Column(nullable = false)
+  CreateAutoTimestamp creationTimestamp = CreateAutoTimestamp.create(null);
+
+  /**
+   * When the claims list was last updated.
+   *
+   * <p>Note that the value of this field is parsed from the claims list file(See this <a
+   * href="https://tools.ietf.org/html/draft-lozano-tmch-func-spec-08#section-6.1">RFC</>), it is
+   * the DNL List creation datetime from the rfc. Since this field has been used by Datastore, we
+   * cannot change its name until we finish the migration.
+   *
+   * <p>TODO(b/166784536): Rename this field to tmdbGenerationTime.
+   */
+  @Column(name = "tmdb_generation_time", nullable = false)
   DateTime creationTime;
 
   /** A map from labels to claims keys. */
   @EmbedMap
+  @ElementCollection
+  @CollectionTable(
+      name = "ClaimsEntry",
+      joinColumns = @JoinColumn(name = "revisionId", referencedColumnName = "revisionId"))
+  @MapKeyColumn(name = "domainLabel", nullable = false)
+  @Column(name = "claimKey", nullable = false)
   Map<String, String> labelsToKeys;
 
   /** Indicates that this is a shard rather than a "full" list. */
-  @Ignore
-  boolean isShard = false;
+  @Ignore @Transient boolean isShard = false;
 
   private static final Retrier LOADER_RETRIER = new Retrier(new SystemSleeper(), 2);
 
@@ -164,10 +205,10 @@ public class ClaimsListShard extends ImmutableObject implements DatastoreEntity
         return datastoreList;
       };
 
-  private static final void loadAndCompareCloudSqlList(ClaimsListShard datastoreList) {
-    Optional<ClaimsList> maybeCloudSqlList = ClaimsListDao.getLatestRevision();
+  private static void loadAndCompareCloudSqlList(ClaimsListShard datastoreList) {
+    Optional<ClaimsListShard> maybeCloudSqlList = ClaimsListDao.getLatestRevision();
     if (maybeCloudSqlList.isPresent()) {
-      ClaimsList cloudSqlList = maybeCloudSqlList.get();
+      ClaimsListShard cloudSqlList = maybeCloudSqlList.get();
       MapDifference<String, String> diff =
           Maps.difference(datastoreList.labelsToKeys, cloudSqlList.getLabelsToKeys());
       if (!diff.areEqual()) {
@@ -206,15 +247,34 @@ public class ClaimsListShard extends ImmutableObject implements DatastoreEntity
       memoizeWithShortExpiration(
           () -> LOADER_RETRIER.callWithRetry(LOADER_CALLABLE, IllegalStateException.class));
 
-  public DateTime getCreationTime() {
+  /** Returns the revision id of this claims list, or throws exception if it is null. */
+  public Long getRevisionId() {
+    checkState(
+        revisionId != null, "revisionId is null because it is not persisted in the database");
+    return revisionId;
+  }
+
+  /**
+   * Returns the time when the external TMDB service generated this revision of the claims list.
+   *
+   * @see <a href="https://tools.ietf.org/html/draft-lozano-tmch-func-spec-08#section-6.1">DNL List
+   *     creation datetime</a>
+   */
+  public DateTime getTmdbGenerationTime() {
     return creationTime;
   }
 
+  /** Returns the creation time of this claims list. */
+  public DateTime getCreationTimestamp() {
+    return creationTimestamp.getTimestamp();
+  }
+
   /** Returns the claim key for a given domain if there is one, empty otherwise. */
   public Optional<String> getClaimKey(String label) {
     return Optional.ofNullable(labelsToKeys.get(label));
   }
 
+  /** Returns an {@link Map} mapping domain label to its lookup key. */
   public ImmutableMap<String, String> getLabelsToKeys() {
     return ImmutableMap.copyOf(labelsToKeys);
   }
@@ -229,11 +289,12 @@ public class ClaimsListShard extends ImmutableObject implements DatastoreEntity
    * switching over to using them atomically, then deleting the old ones.
    */
   public void save() {
-    save(SHARD_SIZE);
+    saveToDatastore(SHARD_SIZE);
+    ClaimsListDao.trySave(this);
   }
 
   @VisibleForTesting
-  void save(int shardSize) {
+  void saveToDatastore(int shardSize) {
     // Figure out what the next versionId should be based on which ones already exist.
     final Key<ClaimsListRevision> oldRevision = getCurrentRevision();
     final Key<ClaimsListRevision> parentKey = ClaimsListRevision.createKey();
@@ -270,10 +331,11 @@ public class ClaimsListShard extends ImmutableObject implements DatastoreEntity
             });
   }
 
-  public static ClaimsListShard create(DateTime creationTime, Map<String, String> labelsToKeys) {
+  public static ClaimsListShard create(
+      DateTime tmdbGenerationTime, Map<String, String> labelsToKeys) {
     ClaimsListShard instance = new ClaimsListShard();
     instance.id = allocateId();
-    instance.creationTime = checkNotNull(creationTime);
+    instance.creationTime = checkNotNull(tmdbGenerationTime);
     instance.labelsToKeys = checkNotNull(labelsToKeys);
     return instance;
   }

core/src/main/java/google/registry/model/translators/VKeyTranslatorFactory.java

@@ -25,6 +25,7 @@ import com.googlecode.objectify.annotation.EntitySubclass;
 import google.registry.persistence.VKey;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import javax.annotation.Nullable;
 
 /**
  * Translator factory for VKey.
@@ -38,7 +39,7 @@ public class VKeyTranslatorFactory extends AbstractSimpleTranslatorFactory<VKey,
   // name, which is all the datastore key gives us.
   // Note that entities annotated with @EntitySubclass are removed because they share the same
   // kind of the key with their parent class.
-  private static final ImmutableMap<String, Class> CLASS_REGISTRY =
+  private static final ImmutableMap<String, Class<?>> CLASS_REGISTRY =
       ALL_CLASSES.stream()
           .filter(clazz -> !clazz.isAnnotationPresent(EntitySubclass.class))
           .collect(toImmutableMap(com.googlecode.objectify.Key::getKind, identity()));
@@ -49,18 +50,23 @@ public class VKeyTranslatorFactory extends AbstractSimpleTranslatorFactory<VKey,
   }
 
   /** Create a VKey from a raw datastore key. */
-  public static VKey<?> createVKey(Key datastoreKey) {
+  @Nullable
+  public static VKey<?> createVKey(@Nullable Key datastoreKey) {
+    if (datastoreKey == null) {
+      return null;
+    }
     return createVKey(com.googlecode.objectify.Key.create(datastoreKey));
   }
 
   /** Create a VKey from an objectify Key. */
-  public static <T> VKey<T> createVKey(com.googlecode.objectify.Key<T> key) {
+  @Nullable
+  public static <T> VKey<T> createVKey(@Nullable com.googlecode.objectify.Key<T> key) {
     if (key == null) {
       return null;
     }
 
     // Try to create the VKey from its reference type.
-    Class clazz = CLASS_REGISTRY.get(key.getKind());
+    Class<T> clazz = (Class<T>) CLASS_REGISTRY.get(key.getKind());
     checkArgument(clazz != null, "Unknown Key type: %s", key.getKind());
     try {
       Method createVKeyMethod =
@@ -93,13 +99,16 @@ public class VKeyTranslatorFactory extends AbstractSimpleTranslatorFactory<VKey,
   @Override
   public SimpleTranslator<VKey, Key> createTranslator() {
     return new SimpleTranslator<VKey, Key>() {
+
+      @Nullable
       @Override
-      public VKey loadValue(Key datastoreValue) {
+      public VKey loadValue(@Nullable Key datastoreValue) {
         return createVKey(datastoreValue);
       }
 
+      @Nullable
       @Override
-      public Key saveValue(VKey key) {
+      public Key saveValue(@Nullable VKey key) {
         return key == null ? null : key.getOfyKey().getRaw();
       }
     };

core/src/main/java/google/registry/persistence/HibernateSchemaExporter.java

@@ -59,6 +59,9 @@ public class HibernateSchemaExporter {
     settings.put(Environment.USER, username);
     settings.put(Environment.PASS, password);
     settings.put(Environment.HBM2DDL_AUTO, "none");
+    // Register driver explicitly to work around ServiceLoader change after Java 8.
+    // Driver self-registration only works if driver is declared in a module.
+    settings.put(Environment.DRIVER, "org.postgresql.Driver");
     settings.put(Environment.SHOW_SQL, "true");
     settings.put(
         Environment.PHYSICAL_NAMING_STRATEGY, NomulusNamingStrategy.class.getCanonicalName());

core/src/main/java/google/registry/persistence/NoopJpaEntityScanner.java

@@ -0,0 +1,45 @@
+// Copyright 2020 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.persistence;
+
+import com.google.common.collect.ImmutableSet;
+import org.hibernate.boot.archive.internal.StandardArchiveDescriptorFactory;
+import org.hibernate.boot.archive.scan.internal.ScanResultImpl;
+import org.hibernate.boot.archive.scan.internal.StandardScanner;
+import org.hibernate.boot.archive.scan.spi.ScanEnvironment;
+import org.hibernate.boot.archive.scan.spi.ScanOptions;
+import org.hibernate.boot.archive.scan.spi.ScanParameters;
+import org.hibernate.boot.archive.scan.spi.ScanResult;
+import org.hibernate.boot.archive.scan.spi.Scanner;
+
+/**
+ * A do-nothing {@link Scanner} for Hibernate that works around bugs in Hibernate's default
+ * implementation. This is required for the Nomulus tool.
+ *
+ * <p>Please refer to <a href="../../../../resources/META-INF/persistence.xml">persistence.xml</a>
+ * for more information.
+ */
+public class NoopJpaEntityScanner extends StandardScanner {
+
+  public NoopJpaEntityScanner() {
+    super(StandardArchiveDescriptorFactory.INSTANCE);
+  }
+
+  @Override
+  public ScanResult scan(
+      ScanEnvironment environment, ScanOptions options, ScanParameters parameters) {
+    return new ScanResultImpl(ImmutableSet.of(), ImmutableSet.of(), ImmutableSet.of());
+  }
+}

core/src/main/java/google/registry/persistence/VKey.java

@@ -14,14 +14,17 @@
 
 package google.registry.persistence;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
 import com.googlecode.objectify.Key;
+import google.registry.model.BackupGroupRoot;
 import google.registry.model.ImmutableObject;
 import google.registry.model.translators.VKeyTranslatorFactory;
 import java.io.Serializable;
 import java.util.Optional;
+import javax.annotation.Nullable;
 
 /**
  * VKey is an abstraction that encapsulates the key concept.
@@ -52,49 +55,62 @@ public class VKey<T> extends ImmutableObject implements Serializable {
    *
    * <p>Deprecated. Create symmetric keys with create() instead.
    */
-  public static <T> VKey<T> createSql(Class<? extends T> kind, Object sqlKey) {
+  public static <T> VKey<T> createSql(Class<T> kind, Object sqlKey) {
     checkArgumentNotNull(kind, "kind must not be null");
     checkArgumentNotNull(sqlKey, "sqlKey must not be null");
-    return new VKey(kind, null, sqlKey);
+    return new VKey<T>(kind, null, sqlKey);
   }
 
   /** Creates a {@link VKey} which only contains the ofy primary key. */
-  public static <T> VKey<T> createOfy(
-      Class<? extends T> kind, com.googlecode.objectify.Key<? extends T> ofyKey) {
+  public static <T> VKey<T> createOfy(Class<T> kind, com.googlecode.objectify.Key<T> ofyKey) {
     checkArgumentNotNull(kind, "kind must not be null");
     checkArgumentNotNull(ofyKey, "ofyKey must not be null");
-    return new VKey(kind, ofyKey, null);
-  }
-
-  /**
-   * Creates a {@link VKey} which only contains the ofy primary key by specifying the id of the
-   * {@link Key}.
-   */
-  public static <T> VKey<T> createOfy(Class<? extends T> kind, long id) {
-    return createOfy(kind, Key.create(kind, id));
-  }
-
-  /**
-   * Creates a {@link VKey} which only contains the ofy primary key by specifying the name of the
-   * {@link Key}.
-   */
-  public static <T> VKey<T> createOfy(Class<? extends T> kind, String name) {
-    checkArgumentNotNull(kind, "name must not be null");
-    return createOfy(kind, Key.create(kind, name));
+    return new VKey<T>(kind, ofyKey, null);
   }
 
   /** Creates a {@link VKey} which only contains both sql and ofy primary key. */
   public static <T> VKey<T> create(
-      Class<? extends T> kind, Object sqlKey, com.googlecode.objectify.Key ofyKey) {
+      Class<T> kind, Object sqlKey, com.googlecode.objectify.Key<T> ofyKey) {
     checkArgumentNotNull(kind, "kind must not be null");
     checkArgumentNotNull(sqlKey, "sqlKey must not be null");
     checkArgumentNotNull(ofyKey, "ofyKey must not be null");
-    return new VKey(kind, ofyKey, sqlKey);
+    return new VKey<T>(kind, ofyKey, sqlKey);
   }
 
-  /** Creates a symmetric {@link VKey} in which both sql and ofy keys are {@code id}. */
-  public static <T> VKey<T> create(Class<? extends T> kind, long id) {
-    return new VKey(kind, Key.create(kind, id), id);
+  /**
+   * Creates a symmetric {@link VKey} in which both sql and ofy keys are {@code id}.
+   *
+   * <p>IMPORTANT USAGE NOTE: Datastore entities that are not roots of entity groups (i.e. those
+   * that do not have a null parent in their Objectify keys) require the full entity group
+   * inheritance chain to be specified and thus cannot use this create method. You need to use
+   * {@link #create(Class, Object, Key)} instead and pass in the full, valid parent field in the
+   * Datastore key.
+   */
+  public static <T> VKey<T> create(Class<T> kind, long id) {
+    checkArgument(
+        kind.isAssignableFrom(BackupGroupRoot.class),
+        "The kind %s is not a BackupGroupRoot and thus needs its entire entity group chain"
+            + " specified in a parent",
+        kind.getCanonicalName());
+    return new VKey<T>(kind, Key.create(kind, id), id);
+  }
+
+  /**
+   * Creates a symmetric {@link VKey} in which both sql and ofy keys are {@code name}.
+   *
+   * <p>IMPORTANT USAGE NOTE: Datastore entities that are not roots of entity groups (i.e. those
+   * that do not have a null parent in their Objectify keys) require the full entity group
+   * inheritance chain to be specified and thus cannot use this create method. You need to use
+   * {@link #create(Class, Object, Key)} instead and pass in the full, valid parent field in the
+   * Datastore key.
+   */
+  public static <T> VKey<T> create(Class<T> kind, String name) {
+    checkArgument(
+        kind.isAssignableFrom(BackupGroupRoot.class),
+        "The kind %s is not a BackupGroupRoot and thus needs its entire entity group chain"
+            + " specified in a parent",
+        kind.getCanonicalName());
+    return new VKey<T>(kind, Key.create(kind, name), name);
   }
 
   /** Returns the type of the entity. */
@@ -125,6 +141,7 @@ public class VKey<T> extends ImmutableObject implements Serializable {
   }
 
   /** Convenience method to construct a VKey from an objectify Key. */
+  @Nullable
   public static <T> VKey<T> from(Key<T> key) {
     return VKeyTranslatorFactory.createVKey(key);
   }

core/src/main/java/google/registry/persistence/converter/AllocationTokenStatusTransitionConverter.java

@@ -0,0 +1,49 @@
+// 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.persistence.converter;
+
+import com.google.common.collect.Maps;
+import google.registry.model.common.TimedTransitionProperty;
+import google.registry.model.domain.token.AllocationToken.TokenStatus;
+import google.registry.model.domain.token.AllocationToken.TokenStatusTransition;
+import java.util.Map;
+import javax.persistence.Converter;
+import org.joda.time.DateTime;
+
+/**
+ * JPA converter for storing/retrieving {@link TimedTransitionProperty} maps referring to {@link
+ * TokenStatus}es.
+ */
+@Converter(autoApply = true)
+public class AllocationTokenStatusTransitionConverter
+    extends TimedTransitionPropertyConverterBase<TokenStatus, TokenStatusTransition> {
+
+  @Override
+  Map.Entry<String, String> convertToDatabaseMapEntry(
+      Map.Entry<DateTime, TokenStatusTransition> entry) {
+    return Maps.immutableEntry(entry.getKey().toString(), entry.getValue().getValue().name());
+  }
+
+  @Override
+  Map.Entry<DateTime, TokenStatus> convertToEntityMapEntry(Map.Entry<String, String> entry) {
+    return Maps.immutableEntry(
+        DateTime.parse(entry.getKey()), TokenStatus.valueOf(entry.getValue()));
+  }
+
+  @Override
+  Class<TokenStatusTransition> getTimedTransitionSubclass() {
+    return TokenStatusTransition.class;
+  }
+}

core/src/main/java/google/registry/persistence/converter/DurationConverter.java

@@ -40,11 +40,17 @@ public class DurationConverter implements AttributeConverter<Duration, PGInterva
     if (duration == null) {
       return new PGInterval();
     }
+    // When the period is created from duration by calling duration.toPeriod(), only precise fields
+    // in the period type will be used. Thus, only the hour, minute, second and millisecond fields
+    // on the period will be used. The year, month, week and day fields will not be populated:
+    //   1. If the duration is small, less than one day, then this method will just set
+    //      hours/minutes/seconds correctly.
+    //   2. If the duration is larger than one day then all the remaining duration will
+    //      be stored in the largest available field, hours in this case.
+    // So, when we convert the period to a PGInterval instance, we set the days field by extracting
+    // it from period's hours field.
+    Period period = duration.toPeriod();
     PGInterval interval = new PGInterval();
-    Period period = new Period(duration);
-    // For some reason when the period is created from the duration, it does not set days, but
-    // instead just a total number of hours. Years and months are not created because those can
-    // differ in length of milliseconds.
     interval.setDays(period.getHours() / 24);
     interval.setHours(period.getHours() % 24);
     interval.setMinutes(period.getMinutes());

core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java

@@ -295,7 +295,7 @@ public class RdapDomainSearchAction extends RdapSearchActionBase {
       query = query.filter("currentSponsorClientId", desiredRegistrar.get());
     }
     return StreamSupport.stream(query.keys().spliterator(), false)
-        .map(key -> VKey.from(key))
+        .map(VKey::from)
         .collect(toImmutableSet());
   }
 
@@ -406,7 +406,7 @@ public class RdapDomainSearchAction extends RdapSearchActionBase {
     }
     return searchByNameserverRefs(
         StreamSupport.stream(query.keys().spliterator(), false)
-            .map(key -> VKey.from(key))
+            .map(VKey::from)
             .collect(toImmutableSet()));
   }
 

core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java

@@ -24,10 +24,13 @@ import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpHeaders;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpResponse;
+import com.google.api.client.http.HttpResponseException;
+import com.google.api.client.http.HttpStatusCodes;
 import com.google.api.client.http.HttpTransport;
 import com.google.common.base.Ascii;
 import com.google.common.base.Splitter;
 import com.google.common.flogger.FluentLogger;
+import com.google.common.io.BaseEncoding;
 import com.google.common.io.ByteStreams;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.keyring.api.KeyModule.Key;
@@ -79,6 +82,7 @@ public class IcannHttpReporter {
     headers.setContentType(CSV_UTF_8.toString());
     request.setHeaders(headers);
     request.setFollowRedirects(false);
+    request.setThrowExceptionOnExecuteError(false);
 
     HttpResponse response = null;
     logger.atInfo().log(
@@ -86,6 +90,12 @@ public class IcannHttpReporter {
     boolean success = true;
     try {
       response = request.execute();
+      // Only responses with a 200 or 400 status have a body. For everything else, throw so that
+      // the caller catches it and prints the stack trace.
+      if (response.getStatusCode() != HttpStatusCodes.STATUS_CODE_OK
+          && response.getStatusCode() != HttpStatusCodes.STATUS_CODE_BAD_REQUEST) {
+        throw new HttpResponseException(response);
+      }
       byte[] content;
       try {
         content = ByteStreams.toByteArray(response.getContent());
@@ -93,11 +103,24 @@ public class IcannHttpReporter {
         response.getContent().close();
       }
       logger.atInfo().log(
-          "Received response code %d with content %s",
-          response.getStatusCode(), new String(content, UTF_8));
-      XjcIirdeaResult result = parseResult(content);
-      if (result.getCode().getValue() != 1000) {
+          "Received response code %d\n\n"
+              + "Response headers: %s\n\n"
+              + "Response content in UTF-8: %s\n\n"
+              + "Response content in HEX: %s",
+          response.getStatusCode(),
+          response.getHeaders(),
+          new String(content, UTF_8),
+          BaseEncoding.base16().encode(content));
+      // For reasons unclear at the moment, when we parse the response content using UTF-8 we get
+      // garbled texts. Since we know that an HTTP 200 response can only contain a result code of
+      // 1000 (i. e. success), there is no need to parse it.
+      if (response.getStatusCode() == HttpStatusCodes.STATUS_CODE_BAD_REQUEST) {
         success = false;
+        // To debug if there is a problem with our parsing, we wrap the response and print the stack
+        // trace of it. As far as we can tell, the stack trace for such an exception contains the
+        // response content that is decoded correctly using the expected charset.
+        new HttpResponseException(response).printStackTrace();
+        XjcIirdeaResult result = parseResult(content);
         logger.atWarning().log(
             "PUT rejected, status code %s:\n%s\n%s",
             result.getCode(), result.getMsg(), result.getDescription());

core/src/main/java/google/registry/schema/tmch/ClaimsList.java

@@ -1,116 +0,0 @@
-// Copyright 2019 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.schema.tmch;
-
-import static com.google.common.base.Preconditions.checkState;
-import static google.registry.util.DateTimeUtils.toJodaDateTime;
-import static google.registry.util.DateTimeUtils.toZonedDateTime;
-
-import com.google.common.collect.ImmutableList;
-import google.registry.model.CreateAutoTimestamp;
-import google.registry.model.ImmutableObject;
-import google.registry.schema.replay.DatastoreEntity;
-import google.registry.schema.replay.SqlEntity;
-import java.time.ZonedDateTime;
-import java.util.Map;
-import java.util.Optional;
-import javax.persistence.CollectionTable;
-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.JoinColumn;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.Table;
-import org.joda.time.DateTime;
-
-/**
- * A list of TMCH claims labels and their associated claims keys.
- *
- * <p>Note that the primary key of this entity is {@link #revisionId}, which is auto-generated by
- * the database. So, if a retry of insertion happens after the previous attempt unexpectedly
- * succeeds, we will end up with having two exact same claims list with only different {@link
- * #revisionId}. However, this is not an actual problem because we only use the claims list with
- * highest {@link #revisionId}.
- */
-@Entity
-@Table
-public class ClaimsList extends ImmutableObject implements SqlEntity {
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  @Column
-  private Long revisionId;
-
-  @Column(nullable = false)
-  private CreateAutoTimestamp creationTimestamp = CreateAutoTimestamp.create(null);
-
-  @Column(nullable = false)
-  private ZonedDateTime tmdbGenerationTime;
-
-  @ElementCollection
-  @CollectionTable(
-      name = "ClaimsEntry",
-      joinColumns = @JoinColumn(name = "revisionId", referencedColumnName = "revisionId"))
-  @MapKeyColumn(name = "domainLabel", nullable = false)
-  @Column(name = "claimKey", nullable = false)
-  private Map<String, String> labelsToKeys;
-
-  private ClaimsList(ZonedDateTime tmdbGenerationTime, Map<String, String> labelsToKeys) {
-    this.tmdbGenerationTime = tmdbGenerationTime;
-    this.labelsToKeys = labelsToKeys;
-  }
-
-  // Hibernate requires this default constructor.
-  private ClaimsList() {}
-
-  /** Constructs a {@link ClaimsList} object. */
-  public static ClaimsList create(DateTime creationTimestamp, Map<String, String> labelsToKeys) {
-    return new ClaimsList(toZonedDateTime(creationTimestamp), labelsToKeys);
-  }
-
-  /** Returns the revision id of this claims list, or throws exception if it is null. */
-  public Long getRevisionId() {
-    checkState(
-        revisionId != null, "revisionId is null because it is not persisted in the database");
-    return revisionId;
-  }
-
-  /** Returns the TMDB generation time of this claims list. */
-  public DateTime getTmdbGenerationTime() {
-    return toJodaDateTime(tmdbGenerationTime);
-  }
-
-  /** Returns the creation time of this claims list. */
-  public DateTime getCreationTimestamp() {
-    return creationTimestamp.getTimestamp();
-  }
-
-  /** Returns an {@link Map} mapping domain label to its lookup key. */
-  public Map<String, String> getLabelsToKeys() {
-    return labelsToKeys;
-  }
-
-  /** Returns the claim key for a given domain if there is one, empty otherwise. */
-  public Optional<String> getClaimKey(String label) {
-    return Optional.ofNullable(labelsToKeys.get(label));
-  }
-
-  @Override
-  public ImmutableList<DatastoreEntity> toDatastoreEntities() {
-    return ImmutableList.of(); // ClaimsList is dual-written
-  }
-}

core/src/main/java/google/registry/tmch/ClaimsListParser.java

@@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableMap;
-import google.registry.schema.tmch.ClaimsList;
+import google.registry.model.tmch.ClaimsListShard;
 import java.util.List;
 import org.joda.time.DateTime;
 
@@ -34,11 +34,11 @@ import org.joda.time.DateTime;
 public class ClaimsListParser {
 
   /**
-   * Converts the lines from the DNL CSV file into a {@link ClaimsList} object.
+   * Converts the lines from the DNL CSV file into a {@link ClaimsListShard} object.
    *
    * <p>Please note that this does <b>not</b> insert the object into Datastore.
    */
-  public static ClaimsList parse(List<String> lines) {
+  public static ClaimsListShard parse(List<String> lines) {
     ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<>();
 
     // First line: <version>,<DNL List creation datetime>
@@ -74,6 +74,6 @@ public class ClaimsListParser {
       builder.put(label, lookupKey);
     }
 
-    return ClaimsList.create(creationTime, builder.build());
+    return ClaimsListShard.create(creationTime, builder.build());
   }
 }

core/src/main/java/google/registry/tmch/TmchDnlAction.java

@@ -21,8 +21,6 @@ import google.registry.keyring.api.KeyModule.Key;
 import google.registry.model.tmch.ClaimsListShard;
 import google.registry.request.Action;
 import google.registry.request.auth.Auth;
-import google.registry.schema.tmch.ClaimsList;
-import google.registry.schema.tmch.ClaimsListDao;
 import java.io.IOException;
 import java.security.SignatureException;
 import java.util.List;
@@ -56,14 +54,10 @@ public final class TmchDnlAction implements Runnable {
     } catch (SignatureException | IOException | PGPException e) {
       throw new RuntimeException(e);
     }
-    ClaimsList claims = ClaimsListParser.parse(lines);
-    ClaimsListShard claimsListShard =
-        ClaimsListShard.create(claims.getTmdbGenerationTime(), claims.getLabelsToKeys());
-    claimsListShard.save();
+    ClaimsListShard claims = ClaimsListParser.parse(lines);
+    claims.save();
     logger.atInfo().log(
         "Inserted %,d claims into Datastore, created at %s",
-        claimsListShard.size(), claimsListShard.getCreationTime());
-
-    ClaimsListDao.trySave(claims);
+        claims.size(), claims.getTmdbGenerationTime());
   }
 }

core/src/main/java/google/registry/tools/DeploySpec11PipelineCommand.java

@@ -34,6 +34,10 @@ public class DeploySpec11PipelineCommand implements Command {
   @Config("projectId")
   String projectId;
 
+  @Inject
+  @Config("defaultJobRegion")
+  String beamJobRegion;
+
   @Parameter(
       names = {"-p", "--project"},
       description = "Cloud KMS project ID",
@@ -71,6 +75,7 @@ public class DeploySpec11PipelineCommand implements Command {
     Spec11Pipeline pipeline =
         new Spec11Pipeline(
             projectId,
+            beamJobRegion,
             beamStagingUrl,
             spec11TemplateUrl,
             reportingBucketUrl,

core/src/main/java/google/registry/tools/GenerateAllocationTokensCommand.java

@@ -115,7 +115,20 @@ class GenerateAllocationTokensCommand implements CommandWithRemoteApi {
       description =
           "A discount off the base price for the first year between 0.0 and 1.0. Default is 0.0,"
               + " i.e. no discount.")
-  private double discountFraction;
+  private Double discountFraction;
+
+  @Parameter(
+      names = {"--discount_premiums"},
+      description =
+          "Whether the discount is valid for premium names in addition to standard ones. Default"
+              + " is false.",
+      arity = 1)
+  private Boolean discountPremiums;
+
+  @Parameter(
+      names = {"--discount_years"},
+      description = "The number of years the discount applies for. Default is 1, max value is 10.")
+  private Integer discountYears;
 
   @Parameter(
       names = "--token_status_transitions",
@@ -169,9 +182,12 @@ class GenerateAllocationTokensCommand implements CommandWithRemoteApi {
                         new AllocationToken.Builder()
                             .setToken(t)
                             .setTokenType(tokenType == null ? SINGLE_USE : tokenType)
-                            .setAllowedClientIds(ImmutableSet.copyOf(nullToEmpty(allowedClientIds)))
-                            .setAllowedTlds(ImmutableSet.copyOf(nullToEmpty(allowedTlds)))
-                            .setDiscountFraction(discountFraction);
+                            .setAllowedRegistrarIds(
+                                ImmutableSet.copyOf(nullToEmpty(allowedClientIds)))
+                            .setAllowedTlds(ImmutableSet.copyOf(nullToEmpty(allowedTlds)));
+                    Optional.ofNullable(discountFraction).ifPresent(token::setDiscountFraction);
+                    Optional.ofNullable(discountPremiums).ifPresent(token::setDiscountPremiums);
+                    Optional.ofNullable(discountYears).ifPresent(token::setDiscountYears);
                     Optional.ofNullable(tokenStatusTransitions)
                         .ifPresent(token::setTokenStatusTransitions);
                     Optional.ofNullable(domainNames)

core/src/main/java/google/registry/tools/GetAllocationTokenCommand.java

@@ -16,6 +16,7 @@ package google.registry.tools;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
@@ -27,7 +28,7 @@ import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.token.AllocationToken;
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
+import java.util.Optional;
 
 /** Command to show allocation tokens. */
 @Parameters(separators = " =", commandDescription = "Show allocation token(s)")
@@ -55,11 +56,11 @@ final class GetAllocationTokenCommand implements CommandWithRemoteApi {
       if (loadedTokens.containsKey(token)) {
         AllocationToken loadedToken = loadedTokens.get(token);
         System.out.println(loadedToken.toString());
-        if (loadedToken.getRedemptionHistoryEntry() == null) {
+        if (!loadedToken.getRedemptionHistoryEntry().isPresent()) {
           System.out.printf("Token %s was not redeemed.\n", token);
         } else {
           DomainBase domain =
-              domains.get(loadedToken.getRedemptionHistoryEntry().<DomainBase>getParent());
+              domains.get(loadedToken.getRedemptionHistoryEntry().get().getOfyKey().getParent());
           if (domain == null) {
             System.out.printf("ERROR: Token %s was redeemed but domain can't be loaded.\n", token);
           } else {
@@ -80,8 +81,10 @@ final class GetAllocationTokenCommand implements CommandWithRemoteApi {
     ImmutableList<Key<DomainBase>> domainKeys =
         tokens.stream()
             .map(AllocationToken::getRedemptionHistoryEntry)
-            .filter(Objects::nonNull)
-            .map(Key::<DomainBase>getParent)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .map(key -> tm().load(key))
+            .map(he -> (Key<DomainBase>) he.getParent())
             .collect(toImmutableList());
     ImmutableMap.Builder<Key<DomainBase>, DomainBase> domainsBuilder = new ImmutableMap.Builder<>();
     for (List<Key<DomainBase>> keys : Lists.partition(domainKeys, BATCH_SIZE)) {

core/src/main/java/google/registry/tools/GetSchemaCommand.java

@@ -14,14 +14,33 @@
 
 package google.registry.tools;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import google.registry.model.SchemaVersion;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 
 /** Generates the schema file used for model versioning. */
 @Parameters(commandDescription = "Generate a model schema file")
 final class GetSchemaCommand implements Command {
+
+  @Parameter(
+      names = {"-o", "--out_file"},
+      description = "Name of the output file.")
+  String outFile;
+
   @Override
-  public void run() {
-    System.out.println(SchemaVersion.getSchema());
+  public void run() throws IOException {
+    String schema = SchemaVersion.getSchema();
+    if (outFile == null) {
+      System.out.println(schema);
+    } else {
+      File file = new File(outFile);
+      file.createNewFile(); // Create the output file if it doesn't already exist.
+      Files.write(file.toPath(), schema.getBytes(UTF_8));
+    }
   }
 }

core/src/main/java/google/registry/tools/MutatingCommand.java

@@ -143,10 +143,14 @@ public abstract class MutatingCommand extends ConfirmingCommand implements Comma
   protected String execute() throws Exception {
     for (final List<EntityChange> batch : getCollatedEntityChangeBatches()) {
       tm().transact(() -> batch.forEach(this::executeChange));
+      postBatchExecute();
     }
     return String.format("Updated %d entities.\n", changedEntitiesMap.size());
   }
 
+  /** Performs any execution step after each batch. */
+  protected void postBatchExecute() {}
+
   private void executeChange(EntityChange change) {
     // Load the key of the entity to mutate and double-check that it hasn't been
     // modified from the version that existed when the change was prepared.

core/src/main/java/google/registry/tools/RegistryCli.java

@@ -112,8 +112,6 @@ final class RegistryCli implements AutoCloseable, CommandRunner {
     // Create all command instances. It would be preferrable to do this in the constructor, but
     // JCommander mutates the command instances and doesn't reset them so we have to do it for every
     // run.
-    // TODO(weiminyu): extract this into a standalone static method to simplify
-    //   :core:registryToolIntegrationTest
     try {
       for (Map.Entry<String, ? extends Class<? extends Command>> entry : commands.entrySet()) {
         Command command = entry.getValue().getDeclaredConstructor().newInstance();

core/src/main/java/google/registry/tools/RegistryTool.java

@@ -99,6 +99,7 @@ public final class RegistryTool {
           .put("remove_ip_address", RemoveIpAddressCommand.class)
           .put("renew_domain", RenewDomainCommand.class)
           .put("resave_entities", ResaveEntitiesCommand.class)
+          .put("resave_entities_with_unique_id", ResaveEntitiesWithUniqueIdCommand.class)
           .put("resave_environment_entities", ResaveEnvironmentEntitiesCommand.class)
           .put("resave_epp_resource", ResaveEppResourceCommand.class)
           .put("send_escrow_report_to_icann", SendEscrowReportToIcannCommand.class)

core/src/main/java/google/registry/tools/ResaveEntitiesWithUniqueIdCommand.java

@@ -0,0 +1,196 @@
+// 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.tools;
+
+import static com.google.common.base.Preconditions.checkState;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.Parameters;
+import com.google.appengine.api.datastore.KeyFactory;
+import com.google.common.base.Splitter;
+import com.google.common.io.CharStreams;
+import com.google.common.io.Files;
+import com.googlecode.objectify.Key;
+import google.registry.model.ImmutableObject;
+import google.registry.model.billing.BillingEvent;
+import google.registry.model.domain.DomainBase;
+import google.registry.util.NonFinalForTesting;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * Command to resave entities with a unique id.
+ *
+ * <p>This command is used to address the duplicate id issue we found for certain {@link
+ * BillingEvent.OneTime} entities. The command reassigns an application wide unique id to the
+ * problematic entity and resaves it, it also resaves the entity having reference to the problematic
+ * entity with the updated id.
+ *
+ * <p>To use this command, you will need to provide the path to a file containing a list of strings
+ * representing the literal of Objectify key for the problematic entities. An example key literal
+ * is:
+ *
+ * <pre>
+ * "DomainBase", "111111-TEST", "HistoryEntry", 2222222, "OneTime", 3333333
+ * </pre>
+ *
+ * <p>Note that the double quotes are part of the key literal. The key literal can be retrieved from
+ * the column <code>__key__.path</code> in BigQuery.
+ */
+@Parameters(separators = " =", commandDescription = "Resave entities with a unique id.")
+public class ResaveEntitiesWithUniqueIdCommand extends MutatingCommand {
+
+  @Parameter(
+      names = "--key_paths_file",
+      description =
+          "Key paths file name, each line in the file should be a key literal. An example key"
+              + " literal is: \"DomainBase\", \"111111-TEST\", \"HistoryEntry\", 2222222,"
+              + " \"OneTime\", 3333333")
+  File keyPathsFile;
+
+  @NonFinalForTesting private static InputStream stdin = System.in;
+
+  private String keyChangeMessage;
+
+  @Override
+  protected void init() throws Exception {
+    List<String> keyPaths =
+        keyPathsFile == null
+            ? CharStreams.readLines(new InputStreamReader(stdin, UTF_8))
+            : Files.readLines(keyPathsFile, UTF_8);
+    for (String keyPath : keyPaths) {
+      Key<?> untypedKey = parseKeyPath(keyPath);
+      Object entity = ofy().load().key(untypedKey).now();
+      if (entity == null) {
+        System.err.println(
+            String.format(
+                "Entity %s read from %s doesn't exist in Datastore! Skipping.",
+                untypedKey,
+                keyPathsFile == null ? "STDIN" : "File " + keyPathsFile.getAbsolutePath()));
+        continue;
+      }
+      if (entity instanceof BillingEvent.OneTime) {
+        resaveBillingEvent((BillingEvent.OneTime) entity);
+      } else {
+        throw new IllegalArgumentException("Unsupported entity key: " + untypedKey);
+      }
+      flushTransaction();
+    }
+  }
+
+  @Override
+  protected void postBatchExecute() {
+    System.out.println(keyChangeMessage);
+  }
+
+  private void deleteOldAndSaveNewEntity(ImmutableObject oldEntity, ImmutableObject newEntity) {
+    stageEntityChange(oldEntity, null);
+    stageEntityChange(null, newEntity);
+  }
+
+  private void resaveBillingEvent(BillingEvent.OneTime billingEvent) {
+    Key<BillingEvent> key = Key.create(billingEvent);
+    Key<DomainBase> domainKey = getGrandParentAsDomain(key);
+    DomainBase domain = ofy().load().key(domainKey).now();
+
+    // The BillingEvent.OneTime entity to be resaved should be the billing event created a few
+    // years ago, so they should not be referenced from TransferData and GracePeriod in the domain.
+    assertNotInDomainTransferData(domain, key);
+    domain
+        .getGracePeriods()
+        .forEach(
+            gracePeriod ->
+                checkState(
+                    !gracePeriod.getOneTimeBillingEvent().getOfyKey().equals(key),
+                    "Entity %s is referenced by a grace period in domain %s",
+                    key,
+                    domainKey));
+
+    // By setting id to 0L, Buildable.build() will assign an application wide unique id to it.
+    BillingEvent.OneTime uniqIdBillingEvent = billingEvent.asBuilder().setId(0L).build();
+    deleteOldAndSaveNewEntity(billingEvent, uniqIdBillingEvent);
+    keyChangeMessage =
+        String.format("Old Entity Key: %s New Entity Key: %s", key, Key.create(uniqIdBillingEvent));
+  }
+
+  private static boolean isKind(Key<?> key, Class<?> clazz) {
+    return key.getKind().equals(Key.getKind(clazz));
+  }
+
+  static Key<?> parseKeyPath(String keyPath) {
+    List<String> keyComponents = Splitter.on(',').splitToList(keyPath);
+    checkState(
+        keyComponents.size() > 0 && keyComponents.size() % 2 == 0,
+        "Invalid number of key components");
+    com.google.appengine.api.datastore.Key rawKey = null;
+    for (int i = 0, j = 1; j < keyComponents.size(); i += 2, j += 2) {
+      String kindLiteral = keyComponents.get(i).trim();
+      String idOrNameLiteral = keyComponents.get(j).trim();
+      rawKey = createDatastoreKey(rawKey, kindLiteral, idOrNameLiteral);
+    }
+    return Key.create(rawKey);
+  }
+
+  private static com.google.appengine.api.datastore.Key createDatastoreKey(
+      com.google.appengine.api.datastore.Key parent, String kindLiteral, String idOrNameLiteral) {
+    if (isLiteralString(idOrNameLiteral)) {
+      return KeyFactory.createKey(parent, removeQuotes(kindLiteral), removeQuotes(idOrNameLiteral));
+    } else {
+      return KeyFactory.createKey(
+          parent, removeQuotes(kindLiteral), Long.parseLong(idOrNameLiteral));
+    }
+  }
+
+  private static boolean isLiteralString(String raw) {
+    return raw.charAt(0) == '"' && raw.charAt(raw.length() - 1) == '"';
+  }
+
+  private static String removeQuotes(String literal) {
+    return literal.substring(1, literal.length() - 1);
+  }
+
+  private static Key<DomainBase> getGrandParentAsDomain(Key<?> key) {
+    Key<?> grandParent;
+    try {
+      grandParent = key.getParent().getParent();
+    } catch (Throwable e) {
+      throw new IllegalArgumentException("Error retrieving grand parent key", e);
+    }
+    if (!isKind(grandParent, DomainBase.class)) {
+      throw new IllegalArgumentException(
+          String.format("Expected a Key<DomainBase> but got %s", grandParent));
+    }
+    return (Key<DomainBase>) grandParent;
+  }
+
+  private static void assertNotInDomainTransferData(DomainBase domainBase, Key<?> key) {
+    if (!domainBase.getTransferData().isEmpty()) {
+      domainBase
+          .getTransferData()
+          .getServerApproveEntities()
+          .forEach(
+              entityKey ->
+                  checkState(
+                      !entityKey.getOfyKey().equals(key),
+                      "Entity %s is referenced by the transfer data in domain %s",
+                      key,
+                      domainBase.createVKey().getOfyKey()));
+    }
+  }
+}

core/src/main/java/google/registry/tools/UpdateAllocationTokensCommand.java

@@ -66,6 +66,19 @@ final class UpdateAllocationTokensCommand extends UpdateOrDeleteAllocationTokens
               + "i.e. no discount.")
   private Double discountFraction;
 
+  @Parameter(
+      names = {"--discount_premiums"},
+      description =
+          "Whether the discount is valid for premium names in addition to standard ones. Default"
+              + " is false.",
+      arity = 1)
+  private Boolean discountPremiums;
+
+  @Parameter(
+      names = {"--discount_years"},
+      description = "The number of years the discount applies for. Default is 1, max value is 10.")
+  private Integer discountYears;
+
   @Parameter(
       names = "--token_status_transitions",
       converter = TokenStatusTransitions.class,
@@ -118,10 +131,12 @@ final class UpdateAllocationTokensCommand extends UpdateOrDeleteAllocationTokens
   private AllocationToken updateToken(AllocationToken original) {
     AllocationToken.Builder builder = original.asBuilder();
     Optional.ofNullable(allowedClientIds)
-        .ifPresent(clientIds -> builder.setAllowedClientIds(ImmutableSet.copyOf(clientIds)));
+        .ifPresent(clientIds -> builder.setAllowedRegistrarIds(ImmutableSet.copyOf(clientIds)));
     Optional.ofNullable(allowedTlds)
         .ifPresent(tlds -> builder.setAllowedTlds(ImmutableSet.copyOf(tlds)));
     Optional.ofNullable(discountFraction).ifPresent(builder::setDiscountFraction);
+    Optional.ofNullable(discountPremiums).ifPresent(builder::setDiscountPremiums);
+    Optional.ofNullable(discountYears).ifPresent(builder::setDiscountYears);
     Optional.ofNullable(tokenStatusTransitions).ifPresent(builder::setTokenStatusTransitions);
     return builder.build();
   }

core/src/main/java/google/registry/tools/UpdateDomainCommand.java

@@ -17,10 +17,11 @@ package google.registry.tools;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static google.registry.model.EppResourceUtils.loadByForeignKey;
+import static google.registry.model.domain.rgp.GracePeriodStatus.AUTO_RENEW;
 import static google.registry.model.eppcommon.StatusValue.SERVER_UPDATE_PROHIBITED;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.PreconditionsUtils.checkArgumentPresent;
-import static org.joda.time.DateTimeZone.UTC;
+import static java.util.function.Predicate.isEqual;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
@@ -31,15 +32,19 @@ import com.google.common.flogger.FluentLogger;
 import com.google.template.soy.data.SoyMapData;
 import google.registry.model.domain.DesignatedContact;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.GracePeriodBase;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.tools.params.NameserversParameter;
 import google.registry.tools.soy.DomainUpdateSoyInfo;
+import google.registry.util.Clock;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
 import org.joda.time.DateTime;
 
 /** A command to update a new domain via EPP. */
@@ -48,6 +53,8 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
+  @Inject Clock clock;
+
   @Parameter(names = "--statuses", description = "Comma-separated list of statuses to set.")
   private List<String> statuses = new ArrayList<>();
 
@@ -123,6 +130,15 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
   )
   boolean clearDsRecords = false;
 
+  @Nullable
+  @Parameter(
+      names = "--autorenews",
+      arity = 1,
+      description =
+          "Whether the domain autorenews. If false, the domain will automatically be"
+              + " deleted at the end of its current registration period.")
+  Boolean autorenews;
+
   @Override
   protected void initMutatingEppToolCommand() {
     if (!nameservers.isEmpty()) {
@@ -159,7 +175,18 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
       clearDsRecords = true;
     }
 
+    ImmutableSet.Builder<String> autorenewGracePeriodWarningDomains = new ImmutableSet.Builder<>();
+    DateTime now = clock.nowUtc();
     for (String domain : domains) {
+      Optional<DomainBase> domainOptional = loadByForeignKey(DomainBase.class, domain, now);
+      checkArgumentPresent(domainOptional, "Domain '%s' does not exist or is deleted", domain);
+      DomainBase domainBase = domainOptional.get();
+      checkArgument(
+          !domainBase.getStatusValues().contains(SERVER_UPDATE_PROHIBITED),
+          "The domain '%s' has status SERVER_UPDATE_PROHIBITED. Verify that you are allowed "
+              + "to make updates, and if so, use the domain_unlock command to enable updates.",
+          domain);
+
       // Use TreeSets so that the results are always in the same order (this makes testing easier).
       Set<String> addAdminsThisDomain = new TreeSet<>(addAdmins);
       Set<String> removeAdminsThisDomain = new TreeSet<>(removeAdmins);
@@ -171,16 +198,6 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
       Set<String> removeStatusesThisDomain = new TreeSet<>(removeStatuses);
 
       if (!nameservers.isEmpty() || !admins.isEmpty() || !techs.isEmpty() || !statuses.isEmpty()) {
-        DateTime now = DateTime.now(UTC);
-        Optional<DomainBase> domainOptional =
-            loadByForeignKey(DomainBase.class, domain, now);
-        checkArgumentPresent(domainOptional, "Domain '%s' does not exist or is deleted", domain);
-        DomainBase domainBase = domainOptional.get();
-        checkArgument(
-            !domainBase.getStatusValues().contains(SERVER_UPDATE_PROHIBITED),
-            "The domain '%s' has status SERVER_UPDATE_PROHIBITED. Verify that you are allowed "
-                + "to make updates, and if so, use the domain_unlock command to enable updates.",
-            domain);
         if (!nameservers.isEmpty()) {
           ImmutableSortedSet<String> existingNameservers = domainBase.loadNameserverHostNames();
           populateAddRemoveLists(
@@ -232,33 +249,41 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
       }
 
       boolean add =
-          !addNameserversThisDomain.isEmpty()
+          (!addNameserversThisDomain.isEmpty()
               || !addAdminsThisDomain.isEmpty()
               || !addTechsThisDomain.isEmpty()
-              || !addStatusesThisDomain.isEmpty();
+              || !addStatusesThisDomain.isEmpty());
 
       boolean remove =
-          !removeNameserversThisDomain.isEmpty()
+          (!removeNameserversThisDomain.isEmpty()
               || !removeAdminsThisDomain.isEmpty()
               || !removeTechsThisDomain.isEmpty()
-              || !removeStatusesThisDomain.isEmpty();
+              || !removeStatusesThisDomain.isEmpty());
 
-      boolean change = registrant != null || password != null;
-
-      boolean secdns =
-          !addDsRecords.isEmpty()
+      boolean change = (registrant != null || password != null);
+      boolean secDns =
+          (!addDsRecords.isEmpty()
               || !removeDsRecords.isEmpty()
               || !dsRecords.isEmpty()
-              || clearDsRecords;
+              || clearDsRecords);
 
-      if (!add && !remove && !change && !secdns) {
+      if (!add && !remove && !change && !secDns && autorenews == null) {
         logger.atInfo().log("No changes need to be made to domain %s", domain);
         continue;
       }
 
+      // If autorenew is being turned off and this domain is already in the autorenew grace period,
+      // then we want to warn the user that they might want to delete it instead.
+      if (Boolean.FALSE.equals(autorenews)) {
+        if (domainBase.getGracePeriods().stream()
+            .map(GracePeriodBase::getType)
+            .anyMatch(isEqual(AUTO_RENEW))) {
+          autorenewGracePeriodWarningDomains.add(domain);
+        }
+      }
+
       setSoyTemplate(DomainUpdateSoyInfo.getInstance(), DomainUpdateSoyInfo.DOMAINUPDATE);
-      addSoyRecord(
-          clientId,
+      SoyMapData soyMapData =
           new SoyMapData(
               "domain", domain,
               "add", add,
@@ -274,14 +299,27 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
               "change", change,
               "registrant", registrant,
               "password", password,
-              "secdns", secdns,
+              "secdns", secDns,
               "addDsRecords", DsRecord.convertToSoy(addDsRecords),
               "removeDsRecords", DsRecord.convertToSoy(removeDsRecords),
-              "removeAllDsRecords", clearDsRecords));
+              "removeAllDsRecords", clearDsRecords);
+      if (autorenews != null) {
+        soyMapData.put("autorenews", autorenews.toString());
+      }
+      addSoyRecord(clientId, soyMapData);
+    }
+
+    ImmutableSet<String> domainsToWarn = autorenewGracePeriodWarningDomains.build();
+    if (!domainsToWarn.isEmpty()) {
+      logger.atWarning().log(
+          "The following domains are in autorenew grace periods. Consider aborting this command"
+              + " and running `nomulus delete_domain` instead to terminate autorenewal immediately"
+              + " rather than in one year, if desired:\n%s",
+          String.join(", ", domainsToWarn));
     }
   }
 
-  protected void populateAddRemoveLists(
+  private void populateAddRemoveLists(
       Set<String> targetSet, Set<String> oldSet, Set<String> addSet, Set<String> removeSet) {
     addSet.addAll(Sets.difference(targetSet, oldSet));
     removeSet.addAll(Sets.difference(oldSet, targetSet));

core/src/main/java/google/registry/tools/UploadClaimsListCommand.java

@@ -22,8 +22,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.base.Joiner;
 import com.google.common.io.Files;
 import google.registry.model.tmch.ClaimsListShard;
-import google.registry.schema.tmch.ClaimsList;
-import google.registry.schema.tmch.ClaimsListDao;
 import google.registry.tmch.ClaimsListParser;
 import java.io.File;
 import java.io.IOException;
@@ -39,7 +37,7 @@ final class UploadClaimsListCommand extends ConfirmingCommand implements Command
 
   private String claimsListFilename;
 
-  private ClaimsList claimsList;
+  private ClaimsListShard claimsList;
 
   @Override
   protected void init() throws IOException {
@@ -58,8 +56,7 @@ final class UploadClaimsListCommand extends ConfirmingCommand implements Command
 
   @Override
   public String execute() {
-    ClaimsListShard.create(claimsList.getTmdbGenerationTime(), claimsList.getLabelsToKeys()).save();
-    ClaimsListDao.trySave(claimsList);
+    claimsList.save();
     return String.format("Successfully uploaded claims list %s", claimsListFilename);
   }
 }

core/src/main/java/google/registry/xjc/XjcObject.java

@@ -42,10 +42,6 @@ public abstract class XjcObject {
     XjcXmlTransformer.marshalStrict(this, out, encoding);
   }
 
-  public void marshalLenient(OutputStream out, Charset encoding) throws XmlException {
-    XjcXmlTransformer.marshalLenient(this, out, encoding);
-  }
-
   /**
    * Turns object into a formatted XML string <i>by any means necessary</i>.
    *

core/src/main/java/google/registry/xml/xsd/superuser.xsd

@@ -47,4 +47,12 @@
     </all>
   </complexType>
 
+  <element name="domainUpdate" type="superuser:domainUpdateType" />
+
+  <complexType name="domainUpdateType">
+    <all>
+      <element name="autorenews" minOccurs="0" type="boolean" />
+    </all>
+  </complexType>
+
 </schema>

core/src/main/javascript/google/registry/ui/js/registrar/registry_lock.js

@@ -56,7 +56,8 @@ registry.registrar.RegistryLock.prototype.runAfterRender = function(objArgs) {
   } else {
     goog.soy.renderElement(
         goog.dom.getRequiredElement('locks-content'),
-        registry.soy.registrar.registrylock.lockNotAllowedOnRegistrar);
+        registry.soy.registrar.registrylock.lockNotAllowedOnRegistrar,
+        {supportEmail: objArgs.supportEmail});
   }
 };
 

core/src/main/resources/META-INF/orm.xml

@@ -10,6 +10,9 @@
       <basic name="amount" access="FIELD"/>
     </attributes>
   </embeddable>
+
+  <sequence-generator name="HistorySequenceGenerator" sequence-name="history_id_sequence" />
+
   <persistence-unit-metadata>
     <persistence-unit-defaults>
       <entity-listeners>

core/src/main/resources/META-INF/persistence.xml

@@ -11,14 +11,33 @@
     <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 
     <!--
-      All JPA entities must be enumerated here. JPA does not support auto detection.
+      All JPA entity-mapping files and annotated classes must be enumerated
+      here. Automatic entity detection is not part of the JPA spec. Explicit
+      declaration makes it easier to migrate to another provider.
 
-      Note that Hibernate's auto detection functionality (hibernate.archive.autodection)
-      does not meet our needs. It only scans archives, not the 'classes' folders. So we
-      are left with two options:
-      *  Move tests to another (sub)project. This is not a big problem, but feels unnatural.
-      *  Use Hibernate's ServiceRegistry for bootstrapping (not JPA-compliant)
+      Although Hibernate provides the auto detection functionality (configured by
+      the hibernate.archive.autodetection property), it relies on a fragile
+      scanner that can be broken by certain classes. For example, in the uber jar
+      for the Nomulus tool, a repackaged Guava class ( {@code
+      com.google.appengine.repackaged.com.google.common.html.LinkDetector})
+      from appengine-api-1.0-sdk:1.9.81 can break the scanner in
+      hibernate-core:5.4.17.Final. The large number of third-party classes also
+      makes JPA setup noticeably slower in the tool.
+
+      When auto detection is enabled in Hibernate, we also need a separate
+      persistence.xml for tests. See <a
+      href="https://stackoverflow.com/questions/61127082/hibernate-doesnt-find-entities-in-test">
+      this webpage</a> for an example.
+
+      Because of the reasons above, we disable auto detection in Hibernate.
+
+      When auto detection is disabled, Hibernate still invokes the scanner which always
+      goes over the archive that has this file. We need to override the default scanner
+      with an NOOP one for Nomulus tool.
     -->
+
+    <mapping-file>META-INF/orm.xml</mapping-file>
+
     <class>google.registry.model.billing.BillingEvent$Cancellation</class>
     <class>google.registry.model.billing.BillingEvent$OneTime</class>
     <class>google.registry.model.billing.BillingEvent$Recurring</class>
@@ -26,6 +45,7 @@
     <class>google.registry.model.contact.ContactResource</class>
     <class>google.registry.model.domain.DomainBase</class>
     <class>google.registry.model.domain.DomainHistory</class>
+    <class>google.registry.model.domain.token.AllocationToken</class>
     <class>google.registry.model.host.HostHistory</class>
     <class>google.registry.model.host.HostResource</class>
     <class>google.registry.model.registrar.Registrar</class>
@@ -33,8 +53,8 @@
     <class>google.registry.model.registry.label.PremiumList</class>
     <class>google.registry.model.reporting.Spec11ThreatMatch</class>
     <class>google.registry.persistence.transaction.TransactionEntity</class>
+    <class>google.registry.model.tmch.ClaimsListShard</class>
     <class>google.registry.schema.domain.RegistryLock</class>
-    <class>google.registry.schema.tmch.ClaimsList</class>
     <class>google.registry.schema.cursor.Cursor</class>
     <class>google.registry.schema.server.Lock</class>
     <class>google.registry.schema.tld.PremiumEntry</class>
@@ -46,6 +66,7 @@
     <class>google.registry.model.registry.label.ReservedList</class>
 
     <!-- Customized type converters -->
+    <class>google.registry.persistence.converter.AllocationTokenStatusTransitionConverter</class>
     <class>google.registry.persistence.converter.BillingCostTransitionConverter</class>
     <class>google.registry.persistence.converter.BillingEventFlagSetConverter</class>
     <class>google.registry.persistence.converter.BloomFilterConverter</class>
@@ -76,8 +97,16 @@
     <class>google.registry.model.host.VKeyConverter_HostResource</class>
     <class>google.registry.model.poll.VKeyConverter_Autorenew</class>
     <class>google.registry.model.poll.VKeyConverter_OneTime</class>
+    <class>google.registry.model.reporting.VKeyConverter_HistoryEntry</class>
 
     <!-- TODO(weiminyu): check out application-layer validation. -->
     <validation-mode>NONE</validation-mode>
+    <properties>
+      <!-- Disables auto detection. -->
+      <property name="hibernate.archive.autodetection" value=""/>
+      <!-- NOOP scanner needed for Nomulus tool. -->
+      <property name="hibernate.archive.scanner"
+          value="google.registry.persistence.NoopJpaEntityScanner"/>
+    </properties>
   </persistence-unit>
 </persistence>

core/src/main/resources/google/registry/tools/soy/DomainUpdate.soy

@@ -35,6 +35,7 @@
   {@param addDsRecords: list<[keyTag:int, alg:int, digestType:int, digest:string]>}
   {@param removeDsRecords: list<[keyTag:int, alg:int, digestType:int, digest:string]>}
   {@param removeAllDsRecords: bool}
+  {@param? autorenews: string}
 
   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
   <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
@@ -96,39 +97,46 @@
           {/if}
         </domain:update>
       </update>
-      {if $secdns}
+      {if $secdns or $autorenews}
         <extension>
-          <secDNS:update xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1">
-            {if $removeAllDsRecords}
-              <secDNS:rem>
-                <secDNS:all>true</secDNS:all>
-              </secDNS:rem>
-            {/if}
-            {if length($removeDsRecords) > 0}
-              <secDNS:rem>
-                {for $dsRecord in $removeDsRecords}
-                  <secDNS:dsData>
-                    <secDNS:keyTag>{$dsRecord.keyTag}</secDNS:keyTag>
-                    <secDNS:alg>{$dsRecord.alg}</secDNS:alg>
-                    <secDNS:digestType>{$dsRecord.digestType}</secDNS:digestType>
-                    <secDNS:digest>{$dsRecord.digest}</secDNS:digest>
-                  </secDNS:dsData>
-                {/for}
-              </secDNS:rem>
-            {/if}
-            {if length($addDsRecords) > 0}
-              <secDNS:add>
-                {for $dsRecord in $addDsRecords}
-                  <secDNS:dsData>
-                    <secDNS:keyTag>{$dsRecord.keyTag}</secDNS:keyTag>
-                    <secDNS:alg>{$dsRecord.alg}</secDNS:alg>
-                    <secDNS:digestType>{$dsRecord.digestType}</secDNS:digestType>
-                    <secDNS:digest>{$dsRecord.digest}</secDNS:digest>
-                  </secDNS:dsData>
-                {/for}
-              </secDNS:add>
-            {/if}
-          </secDNS:update>
+          {if $secdns}
+            <secDNS:update xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1">
+              {if $removeAllDsRecords}
+                <secDNS:rem>
+                  <secDNS:all>true</secDNS:all>
+                </secDNS:rem>
+              {/if}
+              {if length($removeDsRecords) > 0}
+                <secDNS:rem>
+                  {for $dsRecord in $removeDsRecords}
+                    <secDNS:dsData>
+                      <secDNS:keyTag>{$dsRecord.keyTag}</secDNS:keyTag>
+                      <secDNS:alg>{$dsRecord.alg}</secDNS:alg>
+                      <secDNS:digestType>{$dsRecord.digestType}</secDNS:digestType>
+                      <secDNS:digest>{$dsRecord.digest}</secDNS:digest>
+                    </secDNS:dsData>
+                  {/for}
+                </secDNS:rem>
+              {/if}
+              {if length($addDsRecords) > 0}
+                <secDNS:add>
+                  {for $dsRecord in $addDsRecords}
+                    <secDNS:dsData>
+                      <secDNS:keyTag>{$dsRecord.keyTag}</secDNS:keyTag>
+                      <secDNS:alg>{$dsRecord.alg}</secDNS:alg>
+                      <secDNS:digestType>{$dsRecord.digestType}</secDNS:digestType>
+                      <secDNS:digest>{$dsRecord.digest}</secDNS:digest>
+                    </secDNS:dsData>
+                  {/for}
+                </secDNS:add>
+              {/if}
+            </secDNS:update>
+          {/if}
+          {if $autorenews}
+            <superuser:domainUpdate xmlns:superuser="urn:google:params:xml:ns:superuser-1.0">
+              <superuser:autorenews>{$autorenews}</superuser:autorenews>
+            </superuser:domainUpdate>
+          {/if}
         </extension>
       {/if}
       <clTRID>RegistryTool</clTRID>

core/src/main/resources/google/registry/ui/soy/registrar/RegistryLock.soy

@@ -163,5 +163,7 @@
 
 /** Content if the registrar is not allowed to use registry lock. */
 {template .lockNotAllowedOnRegistrar}
-  <h2>Registry Lock is coming soon; please stay tuned for updates.</h2>
+  {@param supportEmail: string}
+  <h2>Sorry, your registrar hasn't enrolled in registry lock yet. To do so, please
+    contact {$supportEmail}.</h2>
 {/template}

core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java

@@ -31,7 +31,7 @@ import static google.registry.testing.TestLogHandlerUtils.assertLogMessage;
 import static org.joda.time.Duration.standardDays;
 import static org.joda.time.Duration.standardHours;
 import static org.joda.time.Duration.standardSeconds;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableSortedSet;
@@ -159,7 +159,7 @@ public class AsyncTaskEnqueuerTest {
                 .setRegistrarPocId("someone@example.com")
                 .setVerificationCode("hi")
                 .build());
-    asyncTaskEnqueuer.enqueueDomainRelock(lock);
+    asyncTaskEnqueuer.enqueueDomainRelock(lock.getRelockDuration().get(), lock.getRevisionId(), 0);
     assertTasksEnqueued(
         QUEUE_ASYNC_ACTIONS,
         new TaskMatcher()
@@ -169,6 +169,7 @@ public class AsyncTaskEnqueuerTest {
             .param(
                 RelockDomainAction.OLD_UNLOCK_REVISION_ID_PARAM,
                 String.valueOf(lock.getRevisionId()))
+            .param(RelockDomainAction.PREVIOUS_ATTEMPTS_PARAM, "0")
             .etaDelta(
                 standardHours(6).minus(standardSeconds(30)),
                 standardHours(6).plus(standardSeconds(30))));
@@ -188,9 +189,9 @@ public class AsyncTaskEnqueuerTest {
                 .setVerificationCode("hi")
                 .build());
     assertThat(
-            assertThrows(
-                IllegalArgumentException.class,
-                () -> asyncTaskEnqueuer.enqueueDomainRelock(lockWithoutDuration)))
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> asyncTaskEnqueuer.enqueueDomainRelock(lockWithoutDuration)))
         .hasMessageThat()
         .isEqualTo(
             String.format(

core/src/test/java/google/registry/batch/RelockDomainActionTest.java

@@ -15,10 +15,12 @@
 package google.registry.batch;
 
 import static com.google.common.truth.Truth.assertThat;
+import static google.registry.batch.AsyncTaskEnqueuer.QUEUE_ASYNC_ACTIONS;
 import static google.registry.model.eppcommon.StatusValue.PENDING_DELETE;
 import static google.registry.model.eppcommon.StatusValue.PENDING_TRANSFER;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.testing.DatastoreHelper.createTlds;
+import static google.registry.testing.DatastoreHelper.deleteResource;
 import static google.registry.testing.DatastoreHelper.newDomainBase;
 import static google.registry.testing.DatastoreHelper.persistActiveHost;
 import static google.registry.testing.DatastoreHelper.persistDomainAsDeleted;
@@ -26,9 +28,16 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import static google.registry.testing.SqlHelper.getMostRecentVerifiedRegistryLockByRepoId;
 import static google.registry.testing.SqlHelper.getRegistryLockByVerificationCode;
 import static google.registry.testing.SqlHelper.saveRegistryLock;
+import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued;
+import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static google.registry.tools.LockOrUnlockDomainCommand.REGISTRY_LOCK_STATUSES;
 import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.joda.time.Duration.standardSeconds;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.domain.DomainBase;
@@ -38,17 +47,27 @@ import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DeterministicStringGenerator;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
+import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.testing.UserInfo;
 import google.registry.tools.DomainLockUtils;
 import google.registry.util.AppEngineServiceUtils;
+import google.registry.util.EmailMessage;
+import google.registry.util.SendEmailService;
 import google.registry.util.StringGenerator.Alphabets;
 import java.util.Optional;
+import javax.mail.internet.InternetAddress;
+import org.joda.time.DateTime;
 import org.joda.time.Duration;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /** Unit tests for {@link RelockDomainAction}. */
+@ExtendWith(MockitoExtension.class)
 public class RelockDomainActionTest {
 
   private static final String DOMAIN_NAME = "example.tld";
@@ -56,7 +75,7 @@ public class RelockDomainActionTest {
   private static final String POC_ID = "marla.singer@example.com";
 
   private final FakeResponse response = new FakeResponse();
-  private final FakeClock clock = new FakeClock();
+  private final FakeClock clock = new FakeClock(DateTime.parse("2015-05-18T12:34:56Z"));
   private final DomainLockUtils domainLockUtils =
       new DomainLockUtils(
           new DeterministicStringGenerator(Alphabets.BASE_58),
@@ -68,15 +87,18 @@ public class RelockDomainActionTest {
   public final AppEngineExtension appEngineRule =
       AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
+          .withTaskQueue()
           .withUserService(UserInfo.create(POC_ID, "12345"))
           .build();
 
   private DomainBase domain;
   private RegistryLock oldLock;
+  @Mock private SendEmailService sendEmailService;
+  private AsyncTaskEnqueuer asyncTaskEnqueuer;
   private RelockDomainAction action;
 
   @BeforeEach
-  void beforeEach() {
+  void beforeEach() throws Exception {
     createTlds("tld", "net");
     HostResource host = persistActiveHost("ns1.example.net");
     domain = persistResource(newDomainBase(DOMAIN_NAME, host));
@@ -88,9 +110,22 @@ public class RelockDomainActionTest {
         domainLockUtils.administrativelyApplyUnlock(
             DOMAIN_NAME, CLIENT_ID, false, Optional.empty());
     assertThat(reloadDomain(domain).getStatusValues()).containsNoneIn(REGISTRY_LOCK_STATUSES);
+
+    AppEngineServiceUtils appEngineServiceUtils = mock(AppEngineServiceUtils.class);
+    lenient()
+        .when(appEngineServiceUtils.getServiceHostname("backend"))
+        .thenReturn("backend.hostname.fake");
+
+    asyncTaskEnqueuer =
+        AsyncTaskEnqueuerTest.createForTesting(appEngineServiceUtils, clock, Duration.ZERO);
     action = createAction(oldLock.getRevisionId());
   }
 
+  @AfterEach
+  void afterEach() {
+    verifyNoMoreInteractions(sendEmailService);
+  }
+
   @Test
   void testLock() {
     action.run();
@@ -104,29 +139,36 @@ public class RelockDomainActionTest {
   }
 
   @Test
-  void testFailure_unknownCode() {
+  void testFailure_unknownCode() throws Exception {
     action = createAction(12128675309L);
     action.run();
     assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
-    assertThat(response.getPayload()).isEqualTo("Relock failed: Unknown revision ID 12128675309");
+    assertThat(response.getPayload()).isEqualTo("Re-lock failed: Unknown revision ID 12128675309");
+    assertTaskEnqueued(1, 12128675309L, Duration.standardMinutes(10)); // should retry, transient
   }
 
   @Test
-  void testFailure_pendingDelete() {
+  void testFailure_pendingDelete() throws Exception {
     persistResource(domain.asBuilder().setStatusValues(ImmutableSet.of(PENDING_DELETE)).build());
     action.run();
+    String expectedFailureMessage = "Domain example.tld has a pending delete.";
     assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
     assertThat(response.getPayload())
-        .isEqualTo(String.format("Relock failed: Domain %s has a pending delete", DOMAIN_NAME));
+        .isEqualTo(String.format("Re-lock failed: %s", expectedFailureMessage));
+    assertNonTransientFailureEmail(expectedFailureMessage);
+    assertNoTasksEnqueued(QUEUE_ASYNC_ACTIONS);
   }
 
   @Test
-  void testFailure_pendingTransfer() {
+  void testFailure_pendingTransfer() throws Exception {
     persistResource(domain.asBuilder().setStatusValues(ImmutableSet.of(PENDING_TRANSFER)).build());
     action.run();
+    String expectedFailureMessage = "Domain example.tld has a pending transfer.";
     assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
     assertThat(response.getPayload())
-        .isEqualTo(String.format("Relock failed: Domain %s has a pending transfer", DOMAIN_NAME));
+        .isEqualTo(String.format("Re-lock failed: %s", expectedFailureMessage));
+    assertNonTransientFailureEmail(expectedFailureMessage);
+    assertNoTasksEnqueued(QUEUE_ASYNC_ACTIONS);
   }
 
   @Test
@@ -135,29 +177,64 @@ public class RelockDomainActionTest {
     action.run();
     assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
     assertThat(response.getPayload())
-        .isEqualTo("Domain example.tld is already manually relocked, skipping automated relock.");
+        .isEqualTo("Domain example.tld is already manually re-locked, skipping automated re-lock.");
+    assertNoTasksEnqueued(QUEUE_ASYNC_ACTIONS);
   }
 
   @Test
-  void testFailure_domainDeleted() {
+  void testFailure_domainDeleted() throws Exception {
     persistDomainAsDeleted(domain, clock.nowUtc());
     action.run();
+    String expectedFailureMessage = "Domain example.tld has been deleted.";
     assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
     assertThat(response.getPayload())
-        .isEqualTo(String.format("Relock failed: Domain %s has been deleted", DOMAIN_NAME));
+        .isEqualTo(String.format("Re-lock failed: %s", expectedFailureMessage));
+    assertNonTransientFailureEmail(expectedFailureMessage);
+    assertNoTasksEnqueued(QUEUE_ASYNC_ACTIONS);
   }
 
   @Test
-  void testFailure_domainTransferred() {
+  void testFailure_domainTransferred() throws Exception {
     persistResource(domain.asBuilder().setPersistedCurrentSponsorClientId("NewRegistrar").build());
     action.run();
+    String expectedFailureMessage =
+        "Domain example.tld has been transferred from registrar TheRegistrar to registrar "
+            + "NewRegistrar since the unlock.";
     assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
     assertThat(response.getPayload())
-        .isEqualTo(
-            String.format(
-                "Relock failed: Domain %s has been transferred from registrar %s to registrar "
-                    + "%s since the unlock",
-                DOMAIN_NAME, CLIENT_ID, "NewRegistrar"));
+        .isEqualTo(String.format("Re-lock failed: %s", expectedFailureMessage));
+    assertNonTransientFailureEmail(expectedFailureMessage);
+    assertNoTasksEnqueued(QUEUE_ASYNC_ACTIONS);
+  }
+
+  @Test
+  public void testFailure_transientFailure_enqueuesTask() {
+    // Hard-delete the domain to simulate a DB failure
+    deleteResource(domain);
+    action.run();
+    assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
+    assertThat(response.getPayload()).isEqualTo("Re-lock failed: null");
+    assertTaskEnqueued(1);
+  }
+
+  @Test
+  void testFailure_sufficientTransientFailures_sendsEmail() throws Exception {
+    // Hard-delete the domain to simulate a DB failure
+    deleteResource(domain);
+    action = createAction(oldLock.getRevisionId(), RelockDomainAction.FAILURES_BEFORE_EMAIL);
+    action.run();
+    assertTaskEnqueued(RelockDomainAction.FAILURES_BEFORE_EMAIL + 1);
+    assertTransientFailureEmail();
+    assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
+    assertThat(response.getPayload()).isEqualTo("Re-lock failed: null");
+  }
+
+  @Test
+  void testSuccess_afterSufficientFailures_sendsEmail() throws Exception {
+    action = createAction(oldLock.getRevisionId(), RelockDomainAction.FAILURES_BEFORE_EMAIL + 1);
+    action.run();
+    assertThat(response.getStatus()).isEqualTo(SC_OK);
+    assertSuccessEmailSent();
   }
 
   @Test
@@ -170,14 +247,108 @@ public class RelockDomainActionTest {
     action.run();
     assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
     assertThat(response.getPayload())
-        .isEqualTo("Domain example.tld is already manually relocked, skipping automated relock.");
+        .isEqualTo("Domain example.tld is already manually re-locked, skipping automated re-lock.");
+    assertNoTasksEnqueued(QUEUE_ASYNC_ACTIONS);
+  }
+
+  @Test
+  void testFailure_slowsDown() throws Exception {
+    deleteResource(domain);
+    action = createAction(oldLock.getRevisionId(), RelockDomainAction.ATTEMPTS_BEFORE_SLOWDOWN);
+    action.run();
+    assertTaskEnqueued(
+        RelockDomainAction.ATTEMPTS_BEFORE_SLOWDOWN + 1,
+        oldLock.getRevisionId(),
+        Duration.standardHours(1));
+  }
+
+  private void assertSuccessEmailSent() throws Exception {
+    EmailMessage expectedEmail =
+        EmailMessage.newBuilder()
+            .setSubject("Successful re-lock of domain example.tld")
+            .setBody(
+                "The domain example.tld was successfully re-locked.\n\nPlease "
+                    + "contact support at support@example.com if you have any questions.")
+            .setRecipients(
+                ImmutableSet.of(new InternetAddress("Marla.Singer.RegistryLock@crr.com")))
+            .setFrom(new InternetAddress("outgoing@example.com"))
+            .build();
+    verify(sendEmailService).sendEmail(expectedEmail);
+  }
+
+  private void assertNonTransientFailureEmail(String exceptionMessage) throws Exception {
+    String expectedBody =
+        String.format(
+            "There was an error when automatically re-locking example.tld. Error message: %s\n\n"
+                + "Please contact support at support@example.com if you have any questions.",
+            exceptionMessage);
+    assertFailureEmailWithBody(
+        expectedBody, ImmutableSet.of(new InternetAddress("Marla.Singer.RegistryLock@crr.com")));
+  }
+
+  private void assertTransientFailureEmail() throws Exception {
+    String expectedBody =
+        "There was an unexpected error when automatically re-locking example.tld. We will continue "
+            + "retrying the lock for five hours. Please contact support at support@example.com if "
+            + "you have any questions";
+    assertFailureEmailWithBody(
+        expectedBody,
+        ImmutableSet.of(
+            new InternetAddress("Marla.Singer.RegistryLock@crr.com"),
+            new InternetAddress("alerts@example.com")));
+  }
+
+  private void assertFailureEmailWithBody(String body, ImmutableSet<InternetAddress> recipients)
+      throws Exception {
+    EmailMessage expectedEmail =
+        EmailMessage.newBuilder()
+            .setSubject("Error re-locking domain example.tld")
+            .setBody(body)
+            .setRecipients(recipients)
+            .setFrom(new InternetAddress("outgoing@example.com"))
+            .build();
+    verify(sendEmailService).sendEmail(expectedEmail);
+  }
+
+  private void assertTaskEnqueued(int numAttempts) {
+    assertTaskEnqueued(numAttempts, oldLock.getRevisionId(), Duration.standardMinutes(10));
+  }
+
+  private void assertTaskEnqueued(int numAttempts, long oldUnlockRevisionId, Duration duration) {
+    assertTasksEnqueued(
+        QUEUE_ASYNC_ACTIONS,
+        new TaskMatcher()
+            .url(RelockDomainAction.PATH)
+            .method("POST")
+            .header("Host", "backend.hostname.fake")
+            .param(
+                RelockDomainAction.OLD_UNLOCK_REVISION_ID_PARAM,
+                String.valueOf(oldUnlockRevisionId))
+            .param(RelockDomainAction.PREVIOUS_ATTEMPTS_PARAM, String.valueOf(numAttempts))
+            .etaDelta(duration.minus(standardSeconds(30)), duration.plus(standardSeconds(30))));
   }
 
   private DomainBase reloadDomain(DomainBase domain) {
     return ofy().load().entity(domain).now();
   }
 
-  private RelockDomainAction createAction(Long oldUnlockRevisionId) {
-    return new RelockDomainAction(oldUnlockRevisionId, domainLockUtils, response);
+  private RelockDomainAction createAction(Long oldUnlockRevisionId) throws Exception {
+    return createAction(oldUnlockRevisionId, 0);
+  }
+
+  private RelockDomainAction createAction(Long oldUnlockRevisionId, int previousAttempts)
+      throws Exception {
+    InternetAddress alertRecipientAddress = new InternetAddress("alerts@example.com");
+    InternetAddress gSuiteOutgoingAddress = new InternetAddress("outgoing@example.com");
+    return new RelockDomainAction(
+        oldUnlockRevisionId,
+        previousAttempts,
+        alertRecipientAddress,
+        gSuiteOutgoingAddress,
+        "support@example.com",
+        sendEmailService,
+        domainLockUtils,
+        response,
+        asyncTaskEnqueuer);
   }
 }

core/src/test/java/google/registry/batch/ResaveEntityActionTest.java

@@ -117,9 +117,10 @@ public class ResaveEntityActionTest {
 
   @Test
   void test_domainPendingDeletion_isResavedAndReenqueued() {
+    DomainBase newDomain = newDomainBase("domain.tld");
     DomainBase domain =
         persistResource(
-            newDomainBase("domain.tld")
+            newDomain
                 .asBuilder()
                 .setDeletionTime(clock.nowUtc().plusDays(35))
                 .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
@@ -127,6 +128,7 @@ public class ResaveEntityActionTest {
                     ImmutableSet.of(
                         GracePeriod.createWithoutBillingEvent(
                             GracePeriodStatus.REDEMPTION,
+                            newDomain.getRepoId(),
                             clock.nowUtc().plusDays(30),
                             "TheRegistrar")))
                 .build());

core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java

@@ -161,6 +161,7 @@ public class DomainBaseUtilTest {
                     .addGracePeriod(
                         GracePeriod.create(
                             GracePeriodStatus.ADD,
+                            "4-COM",
                             fakeClock.nowUtc().plusDays(1),
                             "registrar",
                             null))

core/src/test/java/google/registry/beam/initsql/InitSqlPipelineGraphTest.java

@@ -51,7 +51,7 @@ class InitSqlPipelineGraphTest {
       TestPipelineExtension.create().enableAbandonedNodeEnforcement(false);
 
   @Test
-  public void createPipeline_compareGraph() throws IOException {
+  void createPipeline_compareGraph() throws IOException {
     new InitSqlPipeline(options, testPipeline).setupPipeline();
     String dotString = PipelineDotRenderer.toDotString(testPipeline);
     URL goldenDotUrl = Resources.getResource(InitSqlPipelineGraphTest.class, GOLDEN_DOT_FILE);

core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java

@@ -214,7 +214,11 @@ class InitSqlPipelineTest {
                   .setSmdId("smdid")
                   .addGracePeriod(
                       GracePeriod.create(
-                          GracePeriodStatus.ADD, fakeClock.nowUtc().plusDays(1), "registrar", null))
+                          GracePeriodStatus.ADD,
+                          "4-COM",
+                          fakeClock.nowUtc().plusDays(1),
+                          "registrar",
+                          null))
                   .build());
       exportDir = store.export(exportRootDir.getAbsolutePath(), ALL_KINDS, ImmutableSet.of());
       commitLogDir = Files.createDirectory(tmpDir.resolve("commits")).toFile();

core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java

@@ -69,6 +69,7 @@ class InvoicingPipelineTest {
     invoicingPipeline =
         new InvoicingPipeline(
             "test-project",
+            "region",
             beamTempFolder,
             beamTempFolder + "/templates/invoicing",
             beamTempFolder + "/staging",

core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java

@@ -124,6 +124,7 @@ class Spec11PipelineTest {
     spec11Pipeline =
         new Spec11Pipeline(
             "test-project",
+            "region",
             beamTempFolder + "/staging",
             beamTempFolder + "/templates/invoicing",
             tmpDir.toAbsolutePath().toString(),

core/src/test/java/google/registry/flows/FlowTestCase.java

@@ -16,15 +16,12 @@ package google.registry.flows;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Sets.difference;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static google.registry.model.eppcommon.EppXmlTransformer.marshal;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-import static google.registry.testing.DatastoreHelper.POLL_MESSAGE_ID_STRIPPER;
-import static google.registry.testing.DatastoreHelper.getPollMessages;
 import static google.registry.testing.DatastoreHelper.stripBillingEventId;
 import static google.registry.xml.XmlTestUtils.assertXmlEquals;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -34,7 +31,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ObjectArrays;
-import com.google.common.collect.Streams;
 import google.registry.config.RegistryConfig.ConfigModule.TmchCaMode;
 import google.registry.flows.EppTestComponent.FakesAndMocksModule;
 import google.registry.flows.picker.FlowPicker;
@@ -44,7 +40,6 @@ import google.registry.model.eppcommon.ProtocolDefinition;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.model.ofy.Ofy;
-import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.tmch.ClaimsListShard.ClaimsListSingleton;
 import google.registry.monitoring.whitebox.EppMetric;
@@ -185,6 +180,7 @@ public abstract class FlowTestCase<F extends Flow> {
       builder.put(
           GracePeriod.create(
               entry.getKey().getType(),
+              entry.getKey().getDomainRepoId(),
               entry.getKey().getExpirationTime(),
               entry.getKey().getClientId(),
               null),
@@ -213,24 +209,6 @@ public abstract class FlowTestCase<F extends Flow> {
         .isEqualTo(canonicalizeGracePeriods(expected));
   }
 
-  protected void assertPollMessages(String clientId, PollMessage... expected) {
-    assertPollMessagesHelper(getPollMessages(clientId), expected);
-  }
-
-  protected void assertPollMessages(PollMessage... expected) {
-    assertPollMessagesHelper(getPollMessages(), expected);
-  }
-
-  /** Assert that the list matches all the poll messages in the fake Datastore. */
-  private void assertPollMessagesHelper(
-      Iterable<PollMessage> pollMessages, PollMessage... expected) {
-    // Ordering is irrelevant but duplicates should be considered independently.
-    assertThat(
-            Streams.stream(pollMessages).map(POLL_MESSAGE_ID_STRIPPER).collect(toImmutableList()))
-        .containsExactlyElementsIn(
-            Arrays.stream(expected).map(POLL_MESSAGE_ID_STRIPPER).collect(toImmutableList()));
-  }
-
   private EppOutput runFlowInternal(CommitMode commitMode, UserPrivileges userPrivileges)
       throws Exception {
     eppMetricBuilder = EppMetric.builderForRequest(clock);

core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java

@@ -71,6 +71,7 @@ import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
 import google.registry.model.registry.label.ReservedList;
 import google.registry.model.reporting.HistoryEntry;
+import google.registry.persistence.VKey;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
@@ -162,12 +163,13 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase<DomainCheckFlow, Dom
   @Test
   void testSuccess_oneExists_allocationTokenIsRedeemed() throws Exception {
     setEppInput("domain_check_allocationtoken.xml");
-    persistActiveDomain("example1.tld");
+    DomainBase domain = persistActiveDomain("example1.tld");
+    Key<HistoryEntry> historyEntryKey = Key.create(Key.create(domain), HistoryEntry.class, 1L);
     persistResource(
         new AllocationToken.Builder()
             .setToken("abc123")
             .setTokenType(SINGLE_USE)
-            .setRedemptionHistoryEntry(Key.create(HistoryEntry.class, 1L))
+            .setRedemptionHistoryEntry(VKey.create(HistoryEntry.class, 1L, historyEntryKey))
             .build());
     doCheckTest(
         create(false, "example1.tld", "In use"),
@@ -282,13 +284,14 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase<DomainCheckFlow, Dom
   }
 
   @Test
-  void testSuccess_allocationTokenPromotion() throws Exception {
+  void testSuccess_allocationTokenPromotion_singleYear() throws Exception {
     createTld("example");
     persistResource(
         new AllocationToken.Builder()
             .setToken("abc123")
             .setTokenType(UNLIMITED_USE)
             .setDiscountFraction(0.5)
+            .setDiscountYears(2)
             .setTokenStatusTransitions(
                 ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
                     .put(START_OF_TIME, TokenStatus.NOT_STARTED)
@@ -300,6 +303,69 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase<DomainCheckFlow, Dom
     runFlowAssertResponse(loadFile("domain_check_allocationtoken_fee_response.xml"));
   }
 
+  @Test
+  void testSuccess_allocationTokenPromotion_multiYearAndPremiums() throws Exception {
+    createTld("example");
+    persistResource(
+        new AllocationToken.Builder()
+            .setToken("abc123")
+            .setTokenType(SINGLE_USE)
+            .setDomainName("rich.example")
+            .setDiscountFraction(0.9)
+            .setDiscountYears(3)
+            .setDiscountPremiums(true)
+            .setTokenStatusTransitions(
+                ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
+                    .put(START_OF_TIME, TokenStatus.NOT_STARTED)
+                    .put(clock.nowUtc().minusDays(1), TokenStatus.VALID)
+                    .put(clock.nowUtc().plusDays(1), TokenStatus.ENDED)
+                    .build())
+            .build());
+    setEppInput(
+        "domain_check_allocationtoken_promotion.xml", ImmutableMap.of("DOMAIN", "rich.example"));
+    runFlowAssertResponse(
+        loadFile(
+            "domain_check_allocationtoken_promotion_response.xml",
+            new ImmutableMap.Builder<String, String>()
+                .put("DOMAIN", "rich.example")
+                .put("COST_1YR", "10.00")
+                .put("COST_2YR", "20.00")
+                .put("COST_5YR", "230.00")
+                .put("FEE_CLASS", "<fee:class>premium</fee:class>")
+                .build()));
+  }
+
+  @Test
+  void testSuccess_allocationTokenPromotion_multiYear() throws Exception {
+    createTld("tld");
+    persistResource(
+        new AllocationToken.Builder()
+            .setToken("abc123")
+            .setTokenType(SINGLE_USE)
+            .setDomainName("single.tld")
+            .setDiscountFraction(0.444)
+            .setDiscountYears(2)
+            .setTokenStatusTransitions(
+                ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
+                    .put(START_OF_TIME, TokenStatus.NOT_STARTED)
+                    .put(clock.nowUtc().minusDays(1), TokenStatus.VALID)
+                    .put(clock.nowUtc().plusDays(1), TokenStatus.ENDED)
+                    .build())
+            .build());
+    setEppInput(
+        "domain_check_allocationtoken_promotion.xml", ImmutableMap.of("DOMAIN", "single.tld"));
+    runFlowAssertResponse(
+        loadFile(
+            "domain_check_allocationtoken_promotion_response.xml",
+            new ImmutableMap.Builder<String, String>()
+                .put("DOMAIN", "single.tld")
+                .put("COST_1YR", "7.23")
+                .put("COST_2YR", "14.46")
+                .put("COST_5YR", "53.46")
+                .put("FEE_CLASS", "")
+                .build()));
+  }
+
   @Test
   void testSuccess_promotionNotActive() throws Exception {
     createTld("example");
@@ -353,7 +419,7 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase<DomainCheckFlow, Dom
             .setToken("abc123")
             .setTokenType(UNLIMITED_USE)
             .setDiscountFraction(0.5)
-            .setAllowedClientIds(ImmutableSet.of("someOtherClient"))
+            .setAllowedRegistrarIds(ImmutableSet.of("someOtherClient"))
             .setTokenStatusTransitions(
                 ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
                     .put(START_OF_TIME, TokenStatus.NOT_STARTED)

core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java

@@ -68,6 +68,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Ordering;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig;
 import google.registry.flows.EppException;
@@ -150,17 +151,18 @@ import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.domain.token.AllocationToken;
 import google.registry.model.domain.token.AllocationToken.TokenStatus;
-import google.registry.model.domain.token.AllocationToken.TokenType;
 import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.Registrar.State;
 import google.registry.model.registry.Registry;
+import google.registry.model.registry.Registry.TldState;
 import google.registry.model.registry.Registry.TldType;
 import google.registry.model.reporting.DomainTransactionRecord;
 import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.monitoring.whitebox.EppMetric;
+import google.registry.persistence.VKey;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import java.math.BigDecimal;
 import java.util.Map;
@@ -324,7 +326,8 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     assertGracePeriods(
         domain.getGracePeriods(),
         ImmutableMap.of(
-            GracePeriod.create(GracePeriodStatus.ADD, billingTime, "TheRegistrar", null),
+            GracePeriod.create(
+                GracePeriodStatus.ADD, domain.getRepoId(), billingTime, "TheRegistrar", null),
             createBillingEvent));
     assertDnsTasksEnqueued(getUniqueIdFromCommand());
     assertEppResourceIndexEntityFor(domain);
@@ -435,7 +438,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
 
   @Test
   void testFailure_invalidAllocationToken() {
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     persistContactsAndHosts();
     EppException thrown = assertThrows(InvalidAllocationTokenException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -445,7 +450,8 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
   void testFailure_reservedDomainCreate_allocationTokenIsForADifferentDomain() {
     // Try to register a reserved domain name with an allocation token valid for a different domain
     // name.
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "resdom.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "resdom.tld", "YEARS", "2"));
     persistContactsAndHosts();
     persistResource(
         new AllocationToken.Builder()
@@ -464,7 +470,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
   void testFailure_nonreservedDomainCreate_allocationTokenIsForADifferentDomain() {
     // Try to register a non-reserved domain name with an allocation token valid for a different
     // domain name.
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     persistContactsAndHosts();
     persistResource(
         new AllocationToken.Builder()
@@ -481,13 +489,17 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
 
   @Test
   void testFailure_alreadyRedemeedAllocationToken() {
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     persistContactsAndHosts();
+    DomainBase domain = persistActiveDomain("foo.tld");
+    Key<HistoryEntry> historyEntryKey = Key.create(Key.create(domain), HistoryEntry.class, 505L);
     persistResource(
         new AllocationToken.Builder()
             .setToken("abc123")
             .setTokenType(SINGLE_USE)
-            .setRedemptionHistoryEntry(Key.create(HistoryEntry.class, 505L))
+            .setRedemptionHistoryEntry(VKey.create(HistoryEntry.class, 505L, historyEntryKey))
             .build());
     clock.advanceOneMilli();
     EppException thrown =
@@ -497,7 +509,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
 
   @Test
   void testSuccess_validAllocationToken_isRedeemed() throws Exception {
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     persistContactsAndHosts();
     AllocationToken token =
         persistResource(
@@ -508,12 +522,14 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     HistoryEntry historyEntry =
         ofy().load().type(HistoryEntry.class).ancestor(reloadResourceByForeignKey()).first().now();
     assertThat(ofy().load().entity(token).now().getRedemptionHistoryEntry())
-        .isEqualTo(Key.create(historyEntry));
+        .hasValue(HistoryEntry.createVKey(Key.create(historyEntry)));
   }
 
   @Test
   void testSuccess_validAllocationToken_multiUse() throws Exception {
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     persistContactsAndHosts();
     allocationToken =
         persistResource(
@@ -531,7 +547,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     runFlow();
     assertSuccessfulCreate("tld", ImmutableSet.of(), allocationToken);
     clock.advanceOneMilli();
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "otherexample.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "otherexample.tld", "YEARS", "2"));
     runFlowAssertResponse(
         loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "otherexample.tld")));
   }
@@ -543,8 +561,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     persistContactsAndHosts("foo.tld");
     assertTransactionalFlow(true);
     String expectedResponseXml =
-        loadFile(
-            "domain_create_response.xml", ImmutableMap.of("DOMAIN", "example.foo.tld"));
+        loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "example.foo.tld"));
     runFlowAssertResponse(CommitMode.LIVE, UserPrivileges.NORMAL, expectedResponseXml);
     assertSuccessfulCreate("foo.tld", ImmutableSet.of());
     assertNoLordn();
@@ -576,8 +593,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
         "domain_create_registration_encoded_signed_mark.xml",
         ImmutableMap.of("DOMAIN", "test-validate.tld", "PHASE", "open"));
     persistContactsAndHosts();
-    EppException thrown =
-        assertThrows(SignedMarksOnlyDuringSunriseException.class, this::runFlow);
+    EppException thrown = assertThrows(SignedMarksOnlyDuringSunriseException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
 
@@ -1184,13 +1200,14 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
         Registry.get("tld")
             .asBuilder()
             .setTldStateTransitions(
-                ImmutableSortedMap.of(
-                    START_OF_TIME, PREDELEGATION,
-                    DateTime.parse("1999-01-01T00:00:00Z"), QUIET_PERIOD,
-                    // The anchor tenant is created here, on 1999-04-03
-                    DateTime.parse("1999-07-01T00:00:00Z"), START_DATE_SUNRISE,
-                    DateTime.parse("2000-01-01T00:00:00Z"), GENERAL_AVAILABILITY))
+                new ImmutableSortedMap.Builder<DateTime, TldState>(Ordering.natural())
+                    .put(START_OF_TIME, PREDELEGATION)
+                    .put(DateTime.parse("1999-01-01T00:00:00Z"), QUIET_PERIOD)
+                    .put(DateTime.parse("1999-07-01T00:00:00Z"), START_DATE_SUNRISE)
+                    .put(DateTime.parse("2000-01-01T00:00:00Z"), GENERAL_AVAILABILITY)
+                    .build())
             .build());
+    // The anchor tenant is created during the quiet period, on 1999-04-03.
     setEppInput("domain_create_anchor_allocationtoken.xml");
     persistContactsAndHosts();
     runFlowAssertResponse(loadFile("domain_create_anchor_response.xml"));
@@ -1210,7 +1227,8 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
                 .build());
     // Despite the domain being FULLY_BLOCKED, the non-superuser create succeeds the domain is also
     // RESERVED_FOR_SPECIFIC_USE and the correct allocation token is passed.
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "resdom.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "resdom.tld", "YEARS", "2"));
     persistContactsAndHosts();
     runFlowAssertResponse(
         loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "resdom.tld")));
@@ -1233,7 +1251,8 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
                 .setTokenType(SINGLE_USE)
                 .setDomainName("resdom.tld")
                 .build());
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "resdom.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "resdom.tld", "YEARS", "2"));
     persistContactsAndHosts();
     runFlowAssertResponse(
         loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "resdom.tld")));
@@ -1247,7 +1266,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
         ofy().load().key(Key.create(AllocationToken.class, token)).now();
     assertThat(reloadedToken.isRedeemed()).isTrue();
     assertThat(reloadedToken.getRedemptionHistoryEntry())
-        .isEqualTo(Key.create(getHistoryEntries(reloadResourceByForeignKey()).get(0)));
+        .hasValue(
+            HistoryEntry.createVKey(
+                Key.create(getHistoryEntries(reloadResourceByForeignKey()).get(0))));
   }
 
   private void assertAllocationTokenWasNotRedeemed(String token) {
@@ -1264,7 +1285,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     persistResource(
         new AllocationToken.Builder()
             .setToken("abc123")
-            .setTokenType(TokenType.UNLIMITED_USE)
+            .setTokenType(UNLIMITED_USE)
             .setDiscountFraction(0.5)
             .setTokenStatusTransitions(
                 ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
@@ -1274,7 +1295,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
                     .build())
             .build());
     clock.advanceOneMilli();
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     runFlowAssertResponse(
         loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "example.tld")));
     BillingEvent.OneTime billingEvent =
@@ -1284,14 +1307,131 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
   }
 
   @Test
-  void testSuccess_promotionDoesNotApplyToPremiumPrice() {
-    // At the moment, discounts cannot apply to premium domains
+  void testSuccess_allocationToken_multiYearDiscount_maxesAtTokenDiscountYears() throws Exception {
+    // 2yrs @ $13 + 3yrs @ $13 * (1 - 0.73) = $36.53
+    runTest_allocationToken_multiYearDiscount(false, 0.73, 3, Money.of(USD, 36.53));
+  }
+
+  @Test
+  void testSuccess_allocationToken_multiYearDiscount_maxesAtNumRegistrationYears()
+      throws Exception {
+    // 5yrs @ $13 * (1 - 0.276) = $47.06
+    runTest_allocationToken_multiYearDiscount(false, 0.276, 10, Money.of(USD, 47.06));
+  }
+
+  void runTest_allocationToken_multiYearDiscount(
+      boolean discountPremiums, double discountFraction, int discountYears, Money expectedPrice)
+      throws Exception {
+    persistContactsAndHosts();
+    persistResource(
+        new AllocationToken.Builder()
+            .setToken("abc123")
+            .setTokenType(SINGLE_USE)
+            .setDomainName("example.tld")
+            .setDiscountFraction(discountFraction)
+            .setDiscountYears(discountYears)
+            .setDiscountPremiums(discountPremiums)
+            .setTokenStatusTransitions(
+                ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
+                    .put(START_OF_TIME, TokenStatus.NOT_STARTED)
+                    .put(clock.nowUtc().plusMillis(1), TokenStatus.VALID)
+                    .put(clock.nowUtc().plusSeconds(1), TokenStatus.ENDED)
+                    .build())
+            .build());
+    clock.advanceOneMilli();
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "5"));
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_wildcard.xml",
+            new ImmutableMap.Builder<String, String>()
+                .put("DOMAIN", "example.tld")
+                .put("CRDATE", "1999-04-03T22:00:00.0Z")
+                .put("EXDATE", "2004-04-03T22:00:00.0Z")
+                .build()));
+    BillingEvent.OneTime billingEvent =
+        Iterables.getOnlyElement(ofy().load().type(BillingEvent.OneTime.class));
+    assertThat(billingEvent.getTargetId()).isEqualTo("example.tld");
+    assertThat(billingEvent.getCost()).isEqualTo(expectedPrice);
+  }
+
+  @Test
+  void testSuccess_allocationToken_multiYearDiscount_worksForPremiums() throws Exception {
     createTld("example");
     persistContactsAndHosts();
     persistResource(
         new AllocationToken.Builder()
             .setToken("abc123")
-            .setTokenType(TokenType.UNLIMITED_USE)
+            .setTokenType(SINGLE_USE)
+            .setDomainName("rich.example")
+            .setDiscountFraction(0.98)
+            .setDiscountYears(2)
+            .setDiscountPremiums(true)
+            .setTokenStatusTransitions(
+                ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
+                    .put(START_OF_TIME, TokenStatus.NOT_STARTED)
+                    .put(clock.nowUtc().plusMillis(1), TokenStatus.VALID)
+                    .put(clock.nowUtc().plusSeconds(1), TokenStatus.ENDED)
+                    .build())
+            .build());
+    clock.advanceOneMilli();
+    setEppInput(
+        "domain_create_premium_allocationtoken.xml",
+        ImmutableMap.of("YEARS", "3", "FEE", "104.00"));
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_premium.xml",
+            ImmutableMap.of("EXDATE", "2002-04-03T22:00:00.0Z", "FEE", "104.00")));
+    BillingEvent.OneTime billingEvent =
+        Iterables.getOnlyElement(ofy().load().type(BillingEvent.OneTime.class));
+    assertThat(billingEvent.getTargetId()).isEqualTo("rich.example");
+    // 1yr @ $100 + 2yrs @ $100 * (1 - 0.98) = $104
+    assertThat(billingEvent.getCost()).isEqualTo(Money.of(USD, 104.00));
+  }
+
+  @Test
+  void testSuccess_allocationToken_singleYearDiscount_worksForPremiums() throws Exception {
+    createTld("example");
+    persistContactsAndHosts();
+    persistResource(
+        new AllocationToken.Builder()
+            .setToken("abc123")
+            .setTokenType(SINGLE_USE)
+            .setDomainName("rich.example")
+            .setDiscountFraction(0.95555)
+            .setDiscountPremiums(true)
+            .setTokenStatusTransitions(
+                ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
+                    .put(START_OF_TIME, TokenStatus.NOT_STARTED)
+                    .put(clock.nowUtc().plusMillis(1), TokenStatus.VALID)
+                    .put(clock.nowUtc().plusSeconds(1), TokenStatus.ENDED)
+                    .build())
+            .build());
+    clock.advanceOneMilli();
+    setEppInput(
+        "domain_create_premium_allocationtoken.xml",
+        ImmutableMap.of("YEARS", "3", "FEE", "204.44"));
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_premium.xml",
+            ImmutableMap.of("EXDATE", "2002-04-03T22:00:00.0Z", "FEE", "204.44")));
+    BillingEvent.OneTime billingEvent =
+        Iterables.getOnlyElement(ofy().load().type(BillingEvent.OneTime.class));
+    assertThat(billingEvent.getTargetId()).isEqualTo("rich.example");
+    // 2yrs @ $100 + 1yr @ $100 * (1 - 0.95555) = $204.44
+    assertThat(billingEvent.getCost()).isEqualTo(Money.of(USD, 204.44));
+  }
+
+  @Test
+  void testSuccess_promotionDoesNotApplyToPremiumPrice() {
+    // Discounts only apply to premium domains if the token is explicitly configured to allow it.
+    createTld("example");
+    persistContactsAndHosts();
+    persistResource(
+        new AllocationToken.Builder()
+            .setToken("abc123")
+            .setTokenType(UNLIMITED_USE)
             .setDiscountFraction(0.5)
             .setTokenStatusTransitions(
                 ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
@@ -1301,7 +1441,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
                     .build())
             .build());
     clock.advanceOneMilli();
-    setEppInput("domain_create_premium_allocationtoken.xml");
+    setEppInput(
+        "domain_create_premium_allocationtoken.xml",
+        ImmutableMap.of("YEARS", "2", "FEE", "193.50"));
     assertAboutEppExceptions()
         .that(assertThrows(AllocationTokenInvalidForPremiumNameException.class, this::runFlow))
         .marshalsToXml();
@@ -1313,7 +1455,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     persistResource(
         new AllocationToken.Builder()
             .setToken("abc123")
-            .setTokenType(TokenType.UNLIMITED_USE)
+            .setTokenType(UNLIMITED_USE)
             .setDiscountFraction(0.5)
             .setTokenStatusTransitions(
                 ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
@@ -1322,7 +1464,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
                     .put(clock.nowUtc().plusDays(60), TokenStatus.ENDED)
                     .build())
             .build());
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     assertAboutEppExceptions()
         .that(assertThrows(AllocationTokenNotInPromotionException.class, this::runFlow))
         .marshalsToXml();
@@ -1334,7 +1478,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     persistResource(
         new AllocationToken.Builder()
             .setToken("abc123")
-            .setTokenType(TokenType.UNLIMITED_USE)
+            .setTokenType(UNLIMITED_USE)
             .setAllowedTlds(ImmutableSet.of("example"))
             .setDiscountFraction(0.5)
             .setTokenStatusTransitions(
@@ -1344,7 +1488,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
                     .put(clock.nowUtc().plusDays(1), TokenStatus.ENDED)
                     .build())
             .build());
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     assertAboutEppExceptions()
         .that(assertThrows(AllocationTokenNotValidForTldException.class, this::runFlow))
         .marshalsToXml();
@@ -1356,8 +1502,8 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     persistResource(
         new AllocationToken.Builder()
             .setToken("abc123")
-            .setTokenType(TokenType.UNLIMITED_USE)
-            .setAllowedClientIds(ImmutableSet.of("someClientId"))
+            .setTokenType(UNLIMITED_USE)
+            .setAllowedRegistrarIds(ImmutableSet.of("someClientId"))
             .setDiscountFraction(0.5)
             .setTokenStatusTransitions(
                 ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
@@ -1366,7 +1512,9 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
                     .put(clock.nowUtc().plusDays(1), TokenStatus.ENDED)
                     .build())
             .build());
-    setEppInput("domain_create_allocationtoken.xml", ImmutableMap.of("DOMAIN", "example.tld"));
+    setEppInput(
+        "domain_create_allocationtoken.xml",
+        ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "2"));
     assertAboutEppExceptions()
         .that(assertThrows(AllocationTokenNotValidForRegistrarException.class, this::runFlow))
         .marshalsToXml();
@@ -1562,7 +1710,11 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
     // Modify the Registrar to block premium names.
     persistResource(loadRegistrar("TheRegistrar").asBuilder().setBlockPremiumNames(true).build());
     runFlowAssertResponse(
-        CommitMode.LIVE, SUPERUSER, loadFile("domain_create_response_premium.xml"));
+        CommitMode.LIVE,
+        SUPERUSER,
+        loadFile(
+            "domain_create_response_premium.xml",
+            ImmutableMap.of("EXDATE", "2001-04-03T22:00:00.0Z", "FEE", "200.00")));
     assertSuccessfulCreate("example", ImmutableSet.of());
   }
 

core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java

@@ -36,6 +36,7 @@ import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_DELETE;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.testing.DatastoreHelper.assertBillingEvents;
+import static google.registry.testing.DatastoreHelper.assertPollMessages;
 import static google.registry.testing.DatastoreHelper.createTld;
 import static google.registry.testing.DatastoreHelper.getOnlyHistoryEntryOfType;
 import static google.registry.testing.DatastoreHelper.getOnlyPollMessage;
@@ -195,6 +196,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
                     ImmutableSet.of(
                         GracePeriod.createForRecurring(
                             GracePeriodStatus.AUTO_RENEW,
+                            domain.getRepoId(),
                             A_MONTH_AGO.plusDays(45),
                             "TheRegistrar",
                             autorenewBillingEvent.createVKey())))
@@ -290,7 +292,8 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
   void testDryRun() throws Exception {
     setUpSuccessfulTest();
     setUpGracePeriods(
-        GracePeriod.create(GracePeriodStatus.ADD, TIME_BEFORE_FLOW.plusDays(1), "foo", null));
+        GracePeriod.create(
+            GracePeriodStatus.ADD, domain.getRepoId(), TIME_BEFORE_FLOW.plusDays(1), "foo", null));
     dryRunFlowAssertResponse(loadFile("generic_success_response.xml"));
   }
 
@@ -314,7 +317,8 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
     setUpSuccessfulTest();
     BillingEvent.OneTime graceBillingEvent =
         persistResource(createBillingEvent(Reason.CREATE, Money.of(USD, 123)));
-    setUpGracePeriods(GracePeriod.forBillingEvent(gracePeriodStatus, graceBillingEvent));
+    setUpGracePeriods(
+        GracePeriod.forBillingEvent(gracePeriodStatus, domain.getRepoId(), graceBillingEvent));
     // We should see exactly one poll message, which is for the autorenew 1 month in the future.
     assertPollMessages(createAutorenewPollMessage("TheRegistrar").build());
     clock.advanceOneMilli();
@@ -388,9 +392,14 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
     BillingEvent.OneTime renewBillingEvent =
         persistResource(createBillingEvent(Reason.RENEW, Money.of(USD, 456)));
     setUpGracePeriods(
-        GracePeriod.forBillingEvent(GracePeriodStatus.RENEW, renewBillingEvent),
+        GracePeriod.forBillingEvent(GracePeriodStatus.RENEW, domain.getRepoId(), renewBillingEvent),
         // This grace period has no associated billing event, so it won't cause a cancellation.
-        GracePeriod.create(GracePeriodStatus.TRANSFER, TIME_BEFORE_FLOW.plusDays(1), "foo", null));
+        GracePeriod.create(
+            GracePeriodStatus.TRANSFER,
+            domain.getRepoId(),
+            TIME_BEFORE_FLOW.plusDays(1),
+            "foo",
+            null));
     // We should see exactly one poll message, which is for the autorenew 1 month in the future.
     assertPollMessages(createAutorenewPollMessage("TheRegistrar").build());
     DateTime expectedExpirationTime = domain.getRegistrationExpirationTime().minusYears(2);
@@ -424,6 +433,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
         .containsExactly(
             GracePeriod.create(
                 GracePeriodStatus.REDEMPTION,
+                domain.getRepoId(),
                 clock.nowUtc().plus(Registry.get("tld").getRedemptionGracePeriodLength()),
                 "TheRegistrar",
                 null));
@@ -624,6 +634,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
         .containsExactly(
             GracePeriod.create(
                 GracePeriodStatus.REDEMPTION,
+                domain.getRepoId(),
                 clock.nowUtc().plus(Registry.get("tld").getRedemptionGracePeriodLength()),
                 "TheRegistrar",
                 null));
@@ -696,7 +707,8 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
     BillingEvent.OneTime graceBillingEvent =
         persistResource(createBillingEvent(Reason.CREATE, Money.of(USD, 123)));
     // Use a grace period so that the delete is immediate, simplifying the assertions below.
-    setUpGracePeriods(GracePeriod.forBillingEvent(GracePeriodStatus.ADD, graceBillingEvent));
+    setUpGracePeriods(
+        GracePeriod.forBillingEvent(GracePeriodStatus.ADD, domain.getRepoId(), graceBillingEvent));
     // Add a nameserver.
     HostResource host = persistResource(newHostResource("ns1.example.tld"));
     persistResource(
@@ -1004,7 +1016,11 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
     setUpSuccessfulTest();
     setUpGracePeriods(
         GracePeriod.create(
-            GracePeriodStatus.ADD, TIME_BEFORE_FLOW.plusDays(1), "TheRegistrar", null));
+            GracePeriodStatus.ADD,
+            domain.getRepoId(),
+            TIME_BEFORE_FLOW.plusDays(1),
+            "TheRegistrar",
+            null));
     setUpGracePeriodDurations();
     clock.advanceOneMilli();
     earlierHistoryEntry =
@@ -1027,7 +1043,11 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
     setUpSuccessfulTest();
     setUpGracePeriods(
         GracePeriod.create(
-            GracePeriodStatus.ADD, TIME_BEFORE_FLOW.plusDays(1), "TheRegistrar", null));
+            GracePeriodStatus.ADD,
+            domain.getRepoId(),
+            TIME_BEFORE_FLOW.plusDays(1),
+            "TheRegistrar",
+            null));
     setUpGracePeriodDurations();
     clock.advanceOneMilli();
     earlierHistoryEntry =
@@ -1081,6 +1101,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
         .containsExactly(
             GracePeriod.create(
                 GracePeriodStatus.REDEMPTION,
+                domain.getRepoId(),
                 clock.nowUtc().plus(standardDays(15)),
                 "TheRegistrar",
                 null));
@@ -1127,6 +1148,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
         .containsExactly(
             GracePeriod.create(
                 GracePeriodStatus.REDEMPTION,
+                domain.getRepoId(),
                 clock.nowUtc().plus(standardDays(15)),
                 "TheRegistrar",
                 null));

core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java

@@ -308,7 +308,8 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
         domain
             .asBuilder()
             .addGracePeriod(
-                GracePeriod.create(gracePeriodStatus, clock.nowUtc().plusDays(1), "foo", null))
+                GracePeriod.create(
+                    gracePeriodStatus, domain.getRepoId(), clock.nowUtc().plusDays(1), "foo", null))
             .setCreationClientId("NewRegistrar")
             .setCreationTimeForTest(DateTime.parse("2003-11-26T22:00:00.0Z"))
             .setRegistrationExpirationTime(DateTime.parse("2005-11-26T22:00:00.0Z"))
@@ -337,7 +338,11 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
             .asBuilder()
             .addGracePeriod(
                 GracePeriod.createForRecurring(
-                    GracePeriodStatus.AUTO_RENEW, clock.nowUtc().plusDays(1), "foo", recurringVKey))
+                    GracePeriodStatus.AUTO_RENEW,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(1),
+                    "foo",
+                    recurringVKey))
             .build());
     doSuccessfulTest("domain_info_response_autorenewperiod.xml", false);
   }
@@ -352,7 +357,11 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
             .asBuilder()
             .addGracePeriod(
                 GracePeriod.create(
-                    GracePeriodStatus.REDEMPTION, clock.nowUtc().plusDays(1), "foo", null))
+                    GracePeriodStatus.REDEMPTION,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(1),
+                    "foo",
+                    null))
             .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
             .build());
     doSuccessfulTest("domain_info_response_redemptionperiod.xml", false);
@@ -367,7 +376,11 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
             .asBuilder()
             .addGracePeriod(
                 GracePeriod.create(
-                    GracePeriodStatus.RENEW, clock.nowUtc().plusDays(1), "foo", null))
+                    GracePeriodStatus.RENEW,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(1),
+                    "foo",
+                    null))
             .build());
     doSuccessfulTest("domain_info_response_renewperiod.xml", false);
   }
@@ -381,10 +394,18 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
             .asBuilder()
             .addGracePeriod(
                 GracePeriod.create(
-                    GracePeriodStatus.RENEW, clock.nowUtc().plusDays(1), "foo", null))
+                    GracePeriodStatus.RENEW,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(1),
+                    "foo",
+                    null))
             .addGracePeriod(
                 GracePeriod.create(
-                    GracePeriodStatus.RENEW, clock.nowUtc().plusDays(2), "foo", null))
+                    GracePeriodStatus.RENEW,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(2),
+                    "foo",
+                    null))
             .build());
     doSuccessfulTest("domain_info_response_renewperiod.xml", false);
   }
@@ -398,7 +419,11 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
             .asBuilder()
             .addGracePeriod(
                 GracePeriod.create(
-                    GracePeriodStatus.TRANSFER, clock.nowUtc().plusDays(1), "foo", null))
+                    GracePeriodStatus.TRANSFER,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(1),
+                    "foo",
+                    null))
             .build());
     doSuccessfulTest("domain_info_response_transferperiod.xml", false);
   }
@@ -421,10 +446,19 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
         domain
             .asBuilder()
             .addGracePeriod(
-                GracePeriod.create(GracePeriodStatus.ADD, clock.nowUtc().plusDays(1), "foo", null))
+                GracePeriod.create(
+                    GracePeriodStatus.ADD,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(1),
+                    "foo",
+                    null))
             .addGracePeriod(
                 GracePeriod.create(
-                    GracePeriodStatus.RENEW, clock.nowUtc().plusDays(2), "foo", null))
+                    GracePeriodStatus.RENEW,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(2),
+                    "foo",
+                    null))
             .build());
     doSuccessfulTest("domain_info_response_stackedaddrenewperiod.xml", false);
   }
@@ -437,7 +471,12 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
         domain
             .asBuilder()
             .addGracePeriod(
-                GracePeriod.create(GracePeriodStatus.ADD, clock.nowUtc().plusDays(1), "foo", null))
+                GracePeriod.create(
+                    GracePeriodStatus.ADD,
+                    domain.getRepoId(),
+                    clock.nowUtc().plusDays(1),
+                    "foo",
+                    null))
             .setDsData(
                 ImmutableSet.of(
                     DelegationSignerData.create(