Cherrrpick #1578 into nomulus-20220328-RC00

2026-05-27 02:00:33 +00:00 · 2022-03-31 20:00:10 -04:00
2288 changed files with 151055 additions and 125104 deletions
--- a/.gcloudignore
+++ b/.gcloudignore
@@ -6,4 +6,5 @@ node_modules/
 repos/**
 **/.idea/
 *.jar
+!third_party/**/*.jar
 !/gradle/wrapper/**/*.jar
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,69 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ 'master' ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ 'master' ]
-  schedule:
-    - cron: '24 4 * * 2'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java', 'javascript', 'python' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Set Java version
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '11'
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        queries: security-and-quality
-
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ gjf.out
 *.jar
 *.war
 *.ear
+!/third_party/**/*.jar

 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
@@ -31,7 +32,6 @@ tmp/
 local.properties
 .settings/
 .loadpath
-.DS_Store

 # Eclipse Core
 .project
@@ -79,7 +79,6 @@ autogenerated/
 **/*.iml
 nomulus.ipr
 nomulus.iws
-**/classpath.index

 # Auto-generated java classes by Intellij
 */src/main/generated/
@@ -105,7 +104,7 @@ nomulus.iws
 .gradle/
 **/build
 cloudbuild-caches/
-**/node_modules/**
+node_modules/**
 /repos/

 # Compiled JS/CSS code
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -0,0 +1,6 @@
+extraction:
+  java:
+    prepare:
+      packages: "npm"
+    index:
+      java_version: "11"
--- a/1
+++ b/1
@@ -36,4 +36,3 @@ Shicong Huang <shicong@google.com>
 Gustav Brodman <gbrodman@google.com>
 Sarah Botwinick <sarahbot@google.com>
 Legina Chen <legina@google.com>
-Rachel Guan <rachelguan@google.com>
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Nomulus

-| Internal Build | FOSS Build | License | Code Search |
-|:--------------:|:----------:|:-------:|:-----------:|
-|[![Build Status for Google Registry internal build](https://storage.googleapis.com/domain-registry-kokoro/internal/build.svg)](https://storage.googleapis.com/domain-registry-kokoro/internal/index.html)|[![Build Status for the open source build](https://storage.googleapis.com/domain-registry-kokoro/foss/build.svg)](https://storage.googleapis.com/domain-registry-kokoro/foss/index.html)|[![License for this repo](https://img.shields.io/github/license/google/nomulus.svg)](https://github.com/google/nomulus/blob/master/LICENSE)|[![Link to Code Search](https://www.gstatic.com/devopsconsole/images/oss/favicons/oss-32x32.png)](https://cs.opensource.google/nomulus/nomulus)|
+| Internal Build | FOSS Build | LGTM | License | Code Search |
+|:--------------:|:----------:|:----:|:-------:|:-----------:|
+|[![Build Status for Google Registry internal build](https://storage.googleapis.com/domain-registry-kokoro/internal/build.svg)](https://storage.googleapis.com/domain-registry-kokoro/internal/index.html)|[![Build Status for the open source build](https://storage.googleapis.com/domain-registry-kokoro/foss/build.svg)](https://storage.googleapis.com/domain-registry-kokoro/foss/index.html)|[![Total alerts](https://img.shields.io/lgtm/alerts/g/google/nomulus.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/google/nomulus/alerts/)|[![License for this repo](https://img.shields.io/github/license/google/nomulus.svg)](https://github.com/google/nomulus/blob/master/LICENSE)|[![Link to Code Search](https://www.gstatic.com/devopsconsole/images/oss/favicons/oss-32x32.png)](https://cs.opensource.google/nomulus/nomulus)|

 ![Nomulus logo](./nomulus-logo.png)

--- a/appengine_war.gradle
+++ b/appengine_war.gradle
@@ -26,7 +26,6 @@ project.convention.plugins['war'].webAppDirName =
 apply plugin: 'com.google.cloud.tools.appengine'

 def coreResourcesDir = "${rootDir}/core/build/resources/main"
-def coreLibsDir = "${rootDir}/core/build/libs"

 // Get the web.xml file for the service.
 war {
@@ -39,18 +38,10 @@ war {
    from("${coreResourcesDir}/google/registry/ui/html") {
        include "*.html"
    }
-    from("${coreLibsDir}") {
-        include "core.jar"
-        into("WEB-INF/lib")
-    }
 }

 if (project.path == ":services:default") {
    war {
-        from("${rootDir}/console-webapp/dist/console-webapp") {
-            include "**/*"
-            into("console")
-        }
        from("${coreResourcesDir}/google/registry/ui") {
            include "registrar_bin.js"
            if (environment != "production") {
@@ -86,7 +77,7 @@ appengine {
 }

 dependencies {
-    implementation project(path: ':core', configuration: 'deploy_jar')
+    compile project(path: ':core', configuration: 'deploy_jar')
 }

 // The tools.jar file gets pulled in from the java environment and for some
@@ -103,13 +94,8 @@ explodeWar.doLast {
    file("${it.explodedAppDirectory}/WEB-INF/lib/tools.jar").setWritable(true)
 }

-appengineDeployAll.finalizedBy ':deployCloudSchedulerAndQueue'
 rootProject.deploy.dependsOn appengineDeployAll
 rootProject.stage.dependsOn appengineStage
-tasks['war'].dependsOn ':console-webapp:buildConsoleWebappProd'
-tasks['war'].dependsOn ':core:compileProdJS'
-tasks['war'].dependsOn ':core:processResources'
-tasks['war'].dependsOn ':core:jar'

 // Impose verification for all of the deployment tasks.  We haven't found a
 // better way to do this other than to apply to each of them independently.
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ buildscript {

  dependencies {
    classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.4.1'
-    classpath 'net.ltgt.gradle:gradle-errorprone-plugin:2.0.2'
+    classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.6.1'
    classpath 'org.sonatype.aether:aether-api:1.13.1'
    classpath 'org.sonatype.aether:aether-impl:1.13.1'
  }
@@ -37,11 +37,9 @@ buildscript {

 plugins {
  // Java static analysis plugins. Keep versions consistent with
-  // ./buildSrc/build.gradle.kts
-
-  // Re-enable when compatible with Gradle 8
-  // id 'nebula.lint' version '16.0.2'
-  id 'net.ltgt.errorprone' version '2.0.2'
+  // ./buildSrc/build.gradle
+  id 'nebula.lint' version '16.0.2'
+  id 'net.ltgt.errorprone' version '0.6.1'
  id 'checkstyle'
  id 'com.github.johnrengelman.shadow' version '5.1.0'

@@ -49,16 +47,12 @@ plugins {
  id "com.github.node-gradle.node" version "3.0.1"

  id 'idea'
-  id 'com.diffplug.spotless' version '6.20.0'
+  id 'com.diffplug.gradle.spotless' version '3.25.0'

  id 'jacoco'
  id 'com.dorongold.task-tree' version '2.1.0'
 }

-dependencyLocking {
-    lockAllConfigurations()
-}
-
 node {
  download = true
  version = "16.14.0"
@@ -112,8 +106,7 @@ tasks.build.dependsOn(tasks.checkLicense)
 // Provide defaults for all of the project properties.

 // Only do linting if the build is successful.
-// Re-enable when compatible with Gradle 8
-// gradleLint.autoLintAfterFailure = false
+gradleLint.autoLintAfterFailure = false

 // Paths to main and test sources.
 ext.projectRootDir = "${rootDir}"
@@ -166,7 +159,7 @@ def verifyDeploymentParams() {
        System.err.println('-----------------------------------------------------------------')
        throw new GradleException('Aborting. See prominent error above.')
    } else if (gcpProject == null) {
-        def error = 'You must specify -Penvironment={alpha,crash,qa}'
+        def error = 'You must specify -P environment={alpha,crash,qa}'
        System.err.println("\033[33;1m${error}\033[0m")
        throw GradleException("Aborting:  ${error}")
    }
@@ -179,9 +172,6 @@ rootProject.ext.verifyDeploymentConfig = {

 // Subproject configuration.

-// Alias this since it collides with the closure variable name
-def allowInsecure = allowInsecureProtocol
-
 allprojects {
  // Skip no-op project
  if (project.name == 'services') return
@@ -191,7 +181,6 @@ allprojects {
      maven {
        println "Java dependencies: Using repo ${mavenUrl}..."
        url mavenUrl
-        allowInsecureProtocol = allowInsecure == "true"
      }
    } else {
      println "Java dependencies: Using Maven Central..."
@@ -211,7 +200,7 @@ allprojects {
      tasks.withType(JavaCompile) {
        options.fork = true
        options.forkOptions.executable =
-          file("${System.env.JAVA_HOME}/bin/javac")
+            "${project.rootDir}/kythe/extractors/javac-wrapper.sh"
      }
    }
  }
@@ -272,14 +261,14 @@ subprojects {
    project.tasks.create(
        taskName, com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
      mergeServiceFiles()
-      archiveBaseName = binaryName
+      baseName = binaryName
      if (mainClass != '') {
        manifest {
          attributes 'Main-Class': mainClass
        }
      }
      zip64 = true
-      archiveClassifier = ''
+      classifier = ''
      archiveVersion = ''
      configurations = configs
      from srcOutput
@@ -289,11 +278,6 @@ subprojects {
      // see https://discuss.gradle.org/t/signing-a-custom-gradle-plugin-thats-downloaded-by-the-build-system-from-github/1365
      exclude "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA"
      exclude excludes
-
-      // We do seem to get duplicates when constructing uber-jars, either
-      // this is a product of something in gradle 7 or a product of gradle 7
-      // now giving an error about them when it didn't previously.
-      duplicatesStrategy DuplicatesStrategy.WARN
    }
  }

@@ -308,18 +292,14 @@ subprojects {

  afterEvaluate {
    if (rootProject.enableDependencyLocking.toBoolean()
-        && project.name != 'integration'
-        && project.name != 'java8compatibility') {
+        && project.name != 'integration') {
      // The ':integration' project runs server/schema integration tests using
      // dynamically specified jars with no transitive dependency. Therefore
      // dependency-locking does not make sense. Furthermore, during
-      // evaluation it resolves the 'testRuntimeOnly' configuration, making it
+      // evaluation it resolves the 'testRuntime' configuration, making it
      // immutable. Locking activation would trigger an invalid operation
      // exception.
      //
-      // The ':java8compatibility' project is test-only. Its source does not go
-      // into production.
-      //
      // For all other projects, due to problem with the gradle-license-report
      // plugin, the dependencyLicenseReport configuration must opt out of
      // dependency-locking. See dependency_lic.gradle for the reason why.
@@ -335,17 +315,6 @@ subprojects {
    }
  }

-  // 'listenablefuture' is folded into guava since v32. This block is required
-  // until all transitive dependencies have upgraded past guava v32.
-  // TODO(periodically): remove this block and see if build succeeds.
-  configurations.all {
-    resolutionStrategy
-            .capabilitiesResolution
-            .withCapability("com.google.guava:listenablefuture") {
-      select("com.google.guava:guava:0")
-    }
-  }
-
  def services = [':services:default',
                  ':services:backend',
                  ':services:tools',
@@ -362,12 +331,7 @@ subprojects {

  apply from: "${rootDir.path}/java_common.gradle"

-  if (project.name != 'docs') {
-    compileJava {
-      // TODO: Remove this once we migrate off AppEngine.
-      options.release = 8
-    }
-  }
+  if (project.name == 'third_party') return

  project.tasks.test.dependsOn runPresubmits

@@ -540,10 +504,6 @@ task javaIncrementalFormatApply {

 task javadoc(type: Javadoc) {
  source javadocSource
-  // Java 11.0.17 has the following bug that affects annotation handling on
-  // package-info.java:
-  // https://bugs.openjdk.org/browse/JDK-8222091
-  exclude "**/package-info.java"
  classpath = files(javadocClasspath)
  destinationDir = file("${buildDir}/docs/javadoc")
  options.encoding = "UTF-8"
@@ -562,42 +522,15 @@ tasks.build.dependsOn(tasks.javadoc)
 // core Nomulus codebase, and runs all presubmits.
 task coreDev {
  dependsOn 'javaIncrementalFormatApply'
-  dependsOn 'console-webapp:applyFormatting'
  dependsOn 'javadoc'
  dependsOn 'checkDependenciesDotGradle'
  dependsOn 'checkLicense'
-  dependsOn ':console-webapp:runConsoleWebappUnitTests'
  dependsOn ':core:check'
  dependsOn 'assemble'
 }

 javadocDependentTasks.each { tasks.javadoc.dependsOn(it) }

-// Runs the script, which deploys cloud scheduler and tasks based on the config
-task deployCloudSchedulerAndQueue {
-  doLast {
-    def env = environment
-    if (!prodOrSandboxEnv) {
-      exec {
-        workingDir "${rootDir}/release/builder/"
-        commandLine 'go', 'run',
-                "./deployCloudSchedulerAndQueue.go",
-                "${rootDir}/core/src/main/java/google/registry/config/files/nomulus-config-${env}.yaml",
-                "${rootDir}/core/src/main/java/google/registry/env/${env}/default/WEB-INF/cloud-scheduler-tasks.xml",
-                "domain-registry-${env}"
-      }
-      exec {
-        workingDir "${rootDir}/release/builder/"
-        commandLine 'go', 'run',
-                "./deployCloudSchedulerAndQueue.go",
-                "${rootDir}/core/src/main/java/google/registry/config/files/nomulus-config-${env}.yaml",
-                "${rootDir}/core/src/main/java/google/registry/env/common/default/WEB-INF/cloud-tasks-queue.xml",
-                "domain-registry-${env}"
-      }
-    }
-  }
-}
-
 // disable javadoc in subprojects, these will break because they don't have
 // the correct classpath (see above).
 gradle.taskGraph.whenReady { graph ->
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -0,0 +1,112 @@
+// 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.
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+
+buildscript {
+  if (project.enableDependencyLocking.toBoolean()) {
+    // Lock buildscript dependencies.
+    configurations.classpath {
+      resolutionStrategy.activateDependencyLocking()
+    }
+  }
+}
+
+plugins {
+  // Java static analysis plugins. Keep versions consistent with ../build.gradle
+  id 'nebula.lint' version '16.0.2'
+  id 'net.ltgt.errorprone' version '0.6.1'
+  id 'checkstyle'
+  id 'com.diffplug.gradle.spotless' version '3.25.0'
+}
+
+if (rootProject.enableDependencyLocking.toBoolean()) {
+  // Lock application dependencies.
+  dependencyLocking {
+    lockAllConfigurations()
+  }
+}
+
+repositories {
+  if (isNullOrEmpty(project.ext.properties.mavenUrl)) {
+    println "Java dependencies: Using Maven central..."
+    mavenCentral()
+    google()
+  } else {
+    maven {
+      println "Java dependencies: Using repo ${mavenUrl}..."
+      url mavenUrl
+    }
+  }
+}
+
+apply from: '../dependencies.gradle'
+apply from: '../dependency_lic.gradle'
+apply from: '../java_common.gradle'
+
+sourceSets {
+  main {
+    java {
+      srcDirs += "${project.buildDir}/generated/source/apt/main"
+    }
+  }
+}
+
+checkstyle {
+  configDir file('../config/checkstyle')
+}
+
+dependencies {
+  def deps = dependencyMap
+  compile deps['com.google.auth:google-auth-library-credentials']
+  compile deps['com.google.auth:google-auth-library-oauth2-http']
+  compile deps['com.google.auto.value:auto-value-annotations']
+  compile deps['com.google.common.html.types:types']
+  compile deps['com.google.cloud:google-cloud-core']
+  compile deps['com.google.cloud:google-cloud-storage']
+  compile deps['com.google.guava:guava']
+  compile deps['com.google.protobuf:protobuf-java']
+  compile deps['com.google.template:soy']
+  compile deps['org.apache.commons:commons-text']
+  annotationProcessor deps['com.google.auto.value:auto-value']
+  testCompile deps['com.google.truth:truth']
+  testCompile deps['com.google.truth.extensions:truth-java8-extension']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
+  testCompile deps['org.junit.jupiter:junit-jupiter-engine']
+  testCompile deps['org.mockito:mockito-core']
+}
+
+gradle.projectsEvaluated {
+  tasks.withType(JavaCompile) {
+    options.compilerArgs << "-Xlint:unchecked"
+  }
+}
+
+task exportDependencies {
+  def outputFileProperty = 'dependencyExportFile'
+  def output = project.hasProperty(outputFileProperty)
+      ? new PrintStream(
+          new File(project.getProperty(outputFileProperty)))
+      : System.out
+
+  doLast {
+    project.configurations.all {
+      it.dependencies.findAll {
+        it.group != null
+      }.each {
+        output.println("${it.group}:${it.name}")
+      }
+    }
+  }
+}
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,131 +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.
-
-import java.io.PrintStream;
-
-val enableDependencyLocking: String by project
-val allowInsecureProtocol: String by project
-val allowInsecure = allowInsecureProtocol
-
-buildscript {
-  // We need to do this again within "buildscript" because setting it in the
-  // main script doesn't affect build dependencies.
-  val enableDependencyLocking: String by project
-  if (enableDependencyLocking.toBoolean()) {
-    // Lock application dependencies.
-    dependencyLocking {
-      lockAllConfigurations()
-    }
-  }
-}
-
-plugins {
-  // Java static analysis plugins. Keep versions consistent with ../build.gradle
-
-  // We don't anticipate enabling the Gradle lint plugin because they will not support Kotlin
-  // See https://github.com/nebula-plugins/gradle-lint-plugin/issues/166
-  // id 'nebula.lint' version '16.0.2'
-  id("net.ltgt.errorprone") version "2.0.2"
-  checkstyle
-  id("com.diffplug.spotless") version "6.20.0"
-}
-
-checkstyle {
-    configDirectory.set(file("../config/checkstyle"))
-}
-
-println("enableDependencyLocking is $enableDependencyLocking")
-if (enableDependencyLocking.toBoolean()) {
-  // Lock application dependencies.
-  dependencyLocking {
-    lockAllConfigurations()
-  }
-}
-
-repositories {
-  val mavenUrl = (project.ext.properties.get("mavenUrl") ?: "") as String
-  if (mavenUrl.isEmpty()) {
-    println("Java dependencies: Using Maven central...")
-    mavenCentral()
-    google()
-  } else {
-    maven {
-      println("Java dependencies: Using repo ${mavenUrl}...")
-      url = uri(mavenUrl)
-      isAllowInsecureProtocol = allowInsecureProtocol == "true"
-    }
-  }
-}
-
-apply(from = "../dependencies.gradle")
-apply(from = "../dependency_lic.gradle")
-apply(from = "../java_common.gradle")
-
-// 'listenablefuture' is folded into guava since v32. This block is required
-// until all transitive dependencies have upgraded past guava v32.
-// TODO(periodically): remove this block and see if build succeeds.
-configurations.all {
-  resolutionStrategy
-      .capabilitiesResolution
-      .withCapability("com.google.guava:listenablefuture") {
-      select("com.google.guava:guava:0")
-  }
-}
-
-project.the<SourceSetContainer>()["main"].java {
-  srcDir("${project.buildDir}/generated/source/apt/main")
-}
-
-dependencies {
-  val deps = project.ext["dependencyMap"] as Map<*, *>
-  val implementation by configurations
-  val testImplementation by configurations
-  val annotationProcessor by configurations
-  implementation(deps["com.google.auth:google-auth-library-credentials"]!!)
-  implementation(deps["com.google.auth:google-auth-library-oauth2-http"]!!)
-  implementation(deps["com.google.auto.value:auto-value-annotations"]!!)
-  // implementation(deps["com.google.common.html.types:types"]!!)
-  implementation(deps["com.google.cloud:google-cloud-core"]!!)
-  implementation(deps["com.google.cloud:google-cloud-storage"]!!)
-  implementation(deps["com.google.guava:guava"]!!)
-  implementation(deps["com.google.protobuf:protobuf-java"]!!)
-  implementation(deps["com.google.template:soy"]!!)
-  implementation(deps["org.apache.commons:commons-text"]!!)
-  annotationProcessor(deps["com.google.auto.value:auto-value"]!!)
-  testImplementation(deps["com.google.truth:truth"]!!)
-  testImplementation(
-      deps["com.google.truth.extensions:truth-java8-extension"]!!)
-  testImplementation(deps["org.junit.jupiter:junit-jupiter-api"]!!)
-  testImplementation(deps["org.junit.jupiter:junit-jupiter-engine"]!!)
-  testImplementation(deps["org.mockito:mockito-core"]!!)
-}
-
-gradle.projectsEvaluated {
-  tasks.withType<JavaCompile> {
-    options.compilerArgs.add("-Xlint:unchecked")
-  }
-}
-
-tasks.register("exportDependencies") {
-  doLast {
-    project.configurations.forEach {
-      println("dependency is $it")
-      // it.dependencies.findAll {
-      //   it.group != null
-      // }.each {
-      //   output.println("${it.group}:${it.name}")
-      // }
-    }
-  }
-}
--- a/buildSrc/buildscript-gradle.lockfile
+++ b/buildSrc/buildscript-gradle.lockfile
@@ -1,29 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.diffplug.durian:durian-collect:1.2.0=classpath
-com.diffplug.durian:durian-core:1.2.0=classpath
-com.diffplug.durian:durian-io:1.2.0=classpath
-com.diffplug.durian:durian-swt.os:4.2.0=classpath
-com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:6.20.0=classpath
-com.diffplug.spotless:spotless-lib-extra:2.40.0=classpath
-com.diffplug.spotless:spotless-lib:2.40.0=classpath
-com.diffplug.spotless:spotless-plugin-gradle:6.20.0=classpath
-com.googlecode.concurrent-trees:concurrent-trees:2.6.1=classpath
-com.googlecode.javaewah:JavaEWAH:1.2.3=classpath
-com.squareup.okhttp3:okhttp:4.10.0=classpath
-com.squareup.okio:okio-jvm:3.0.0=classpath
-com.squareup.okio:okio:3.0.0=classpath
-dev.equo.ide:solstice:1.3.1=classpath
-net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:2.0.2=classpath
-net.ltgt.gradle:gradle-errorprone-plugin:2.0.2=classpath
-org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r=classpath
-org.eclipse.platform:org.eclipse.osgi:3.18.300=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.0=classpath
-org.jetbrains:annotations:13.0=classpath
-org.slf4j:slf4j-api:1.7.36=classpath
-org.tukaani:xz:1.9=classpath
-empty=
--- a/buildSrc/gradle.lockfile
+++ b/buildSrc/gradle.lockfile
@@ -1,110 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-aopalliance:aopalliance:1.0=buildScriptClasspath,compileClasspath
-args4j:args4j:2.0.23=buildScriptClasspath,compileClasspath
-com.fasterxml.jackson.core:jackson-core:2.14.2=buildScriptClasspath,compileClasspath
-com.fasterxml.jackson:jackson-bom:2.14.2=buildScriptClasspath,compileClasspath
-com.github.ben-manes.caffeine:caffeine:2.7.0=annotationProcessor
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor
-com.google.android:annotations:4.1.1.4=buildScriptClasspath
-com.google.api-client:google-api-client:2.2.0=buildScriptClasspath,compileClasspath
-com.google.api.grpc:gapic-google-cloud-storage-v2:2.22.6-alpha=buildScriptClasspath,compileClasspath
-com.google.api.grpc:grpc-google-cloud-storage-v2:2.22.6-alpha=buildScriptClasspath,compileClasspath
-com.google.api.grpc:proto-google-cloud-storage-v2:2.22.6-alpha=buildScriptClasspath,compileClasspath
-com.google.api.grpc:proto-google-common-protos:2.22.0=buildScriptClasspath,compileClasspath
-com.google.api.grpc:proto-google-iam-v1:1.17.0=buildScriptClasspath,compileClasspath
-com.google.api:api-common:2.14.0=buildScriptClasspath,compileClasspath
-com.google.api:gax-grpc:2.31.0=buildScriptClasspath,compileClasspath
-com.google.api:gax-httpjson:2.31.0=buildScriptClasspath,compileClasspath
-com.google.api:gax:2.31.0=buildScriptClasspath,compileClasspath
-com.google.apis:google-api-services-storage:v1-rev20230301-2.0.0=buildScriptClasspath,compileClasspath
-com.google.auth:google-auth-library-credentials:1.19.0=buildScriptClasspath,compileClasspath
-com.google.auth:google-auth-library-oauth2-http:1.19.0=buildScriptClasspath,compileClasspath
-com.google.auto.value:auto-value-annotations:1.10.1=buildScriptClasspath,compileClasspath
-com.google.auto.value:auto-value:1.10.4=annotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor
-com.google.cloud:google-cloud-core-grpc:2.21.0=buildScriptClasspath,compileClasspath
-com.google.cloud:google-cloud-core-http:2.21.0=buildScriptClasspath,compileClasspath
-com.google.cloud:google-cloud-core:2.21.0=buildScriptClasspath,compileClasspath
-com.google.cloud:google-cloud-storage:2.22.6=buildScriptClasspath,compileClasspath
-com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,buildScriptClasspath,compileClasspath
-com.google.code.gson:gson:2.10.1=buildScriptClasspath,compileClasspath
-com.google.common.html.types:types:1.0.6=buildScriptClasspath,compileClasspath
-com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor
-com.google.errorprone:error_prone_annotations:2.18.0=buildScriptClasspath,compileClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=annotationProcessor
-com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor
-com.google.errorprone:error_prone_core:2.3.4=annotationProcessor
-com.google.errorprone:error_prone_type_annotations:2.3.4=annotationProcessor
-com.google.escapevelocity:escapevelocity:0.9.1=buildScriptClasspath,compileClasspath
-com.google.guava:failureaccess:1.0.1=annotationProcessor,buildScriptClasspath,compileClasspath
-com.google.guava:guava-parent:32.1.1-jre=buildScriptClasspath,compileClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor
-com.google.guava:guava:32.1.1-jre=buildScriptClasspath,compileClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor
-com.google.http-client:google-http-client-apache-v2:1.43.3=buildScriptClasspath,compileClasspath
-com.google.http-client:google-http-client-appengine:1.43.3=buildScriptClasspath,compileClasspath
-com.google.http-client:google-http-client-gson:1.43.3=buildScriptClasspath,compileClasspath
-com.google.http-client:google-http-client-jackson2:1.43.3=buildScriptClasspath,compileClasspath
-com.google.http-client:google-http-client:1.43.3=buildScriptClasspath,compileClasspath
-com.google.inject.extensions:guice-multibindings:4.1.0=buildScriptClasspath,compileClasspath
-com.google.inject:guice:4.1.0=buildScriptClasspath,compileClasspath
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor
-com.google.j2objc:j2objc-annotations:2.8=buildScriptClasspath,compileClasspath
-com.google.jsinterop:jsinterop-annotations:1.0.1=buildScriptClasspath,compileClasspath
-com.google.oauth-client:google-oauth-client:1.34.1=buildScriptClasspath,compileClasspath
-com.google.protobuf:protobuf-java-util:3.23.2=buildScriptClasspath,compileClasspath
-com.google.protobuf:protobuf-java:3.23.2=buildScriptClasspath,compileClasspath
-com.google.protobuf:protobuf-java:3.4.0=annotationProcessor
-com.google.re2j:re2j:1.6=buildScriptClasspath
-com.google.template:soy:2021-02-01=buildScriptClasspath,compileClasspath
-com.googlecode.java-diff-utils:diffutils:1.3.0=annotationProcessor
-com.ibm.icu:icu4j:57.1=buildScriptClasspath,compileClasspath
-commons-codec:commons-codec:1.15=buildScriptClasspath,compileClasspath
-commons-logging:commons-logging:1.2=buildScriptClasspath,compileClasspath
-io.grpc:grpc-alts:1.55.3=buildScriptClasspath,compileClasspath
-io.grpc:grpc-api:1.55.3=buildScriptClasspath,compileClasspath
-io.grpc:grpc-auth:1.55.3=buildScriptClasspath,compileClasspath
-io.grpc:grpc-context:1.55.3=buildScriptClasspath,compileClasspath
-io.grpc:grpc-core:1.55.3=buildScriptClasspath
-io.grpc:grpc-googleapis:1.55.3=buildScriptClasspath
-io.grpc:grpc-grpclb:1.55.3=buildScriptClasspath,compileClasspath
-io.grpc:grpc-netty-shaded:1.55.3=buildScriptClasspath
-io.grpc:grpc-protobuf-lite:1.55.3=buildScriptClasspath,compileClasspath
-io.grpc:grpc-protobuf:1.55.3=buildScriptClasspath,compileClasspath
-io.grpc:grpc-rls:1.55.3=buildScriptClasspath
-io.grpc:grpc-services:1.55.3=buildScriptClasspath
-io.grpc:grpc-stub:1.55.3=buildScriptClasspath,compileClasspath
-io.grpc:grpc-xds:1.55.3=buildScriptClasspath
-io.opencensus:opencensus-api:0.31.1=buildScriptClasspath,compileClasspath
-io.opencensus:opencensus-contrib-http-util:0.31.1=buildScriptClasspath,compileClasspath
-io.opencensus:opencensus-proto:0.2.0=buildScriptClasspath
-io.perfmark:perfmark-api:0.26.0=buildScriptClasspath
-javax.annotation:javax.annotation-api:1.3.2=buildScriptClasspath,compileClasspath
-javax.annotation:jsr250-api:1.0=buildScriptClasspath,compileClasspath
-javax.inject:javax.inject:1=buildScriptClasspath,compileClasspath
-org.apache.commons:commons-lang3:3.12.0=buildScriptClasspath,compileClasspath
-org.apache.commons:commons-text:1.10.0=buildScriptClasspath,compileClasspath
-org.apache.httpcomponents:httpclient:4.5.14=buildScriptClasspath,compileClasspath
-org.apache.httpcomponents:httpcore:4.4.16=buildScriptClasspath,compileClasspath
-org.checkerframework:checker-qual:3.0.0=annotationProcessor
-org.checkerframework:checker-qual:3.33.0=buildScriptClasspath,compileClasspath
-org.checkerframework:dataflow:3.0.0=annotationProcessor
-org.checkerframework:javacutil:3.0.0=annotationProcessor
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor
-org.codehaus.mojo:animal-sniffer-annotations:1.23=buildScriptClasspath
-org.conscrypt:conscrypt-openjdk-uber:2.5.2=buildScriptClasspath,compileClasspath
-org.json:json:20160212=buildScriptClasspath,compileClasspath
-org.ow2.asm:asm-analysis:7.0=buildScriptClasspath,compileClasspath
-org.ow2.asm:asm-commons:7.0=buildScriptClasspath,compileClasspath
-org.ow2.asm:asm-tree:7.0=buildScriptClasspath,compileClasspath
-org.ow2.asm:asm-util:7.0=buildScriptClasspath,compileClasspath
-org.ow2.asm:asm:7.0=buildScriptClasspath,compileClasspath
-org.pcollections:pcollections:2.1.2=annotationProcessor
-org.plumelib:plume-util:1.0.6=annotationProcessor
-org.plumelib:reflection-util:0.0.2=annotationProcessor
-org.plumelib:require-javadoc:0.1.0=annotationProcessor
-org.threeten:threetenbp:1.6.8=buildScriptClasspath,compileClasspath
-empty=
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -1,3 +1 @@
-pluginsUrl=https://plugins.gradle.org/m2/
-allowInsecureProtocol=
 enableDependencyLocking=true
--- a/buildSrc/gradle/dependency-locks/annotationProcessor.lockfile
+++ b/buildSrc/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,28 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
+com.github.kevinstern:software-and-algorithms:1.0
+com.google.auto.value:auto-value:1.7.4
+com.google.auto:auto-common:0.10
+com.google.code.findbugs:jFormatString:3.0.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:27.0.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.1
+com.google.protobuf:protobuf-java:3.4.0
+com.googlecode.java-diff-utils:diffutils:1.3.0
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0
--- a/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile
+++ b/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile
@@ -0,0 +1,51 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.diffplug.durian:durian-collect:1.2.0
+com.diffplug.durian:durian-core:1.2.0
+com.diffplug.durian:durian-io:1.2.0
+com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:3.25.0
+com.diffplug.spotless:spotless-lib-extra:1.25.0
+com.diffplug.spotless:spotless-lib:1.25.0
+com.diffplug.spotless:spotless-plugin-gradle:3.25.0
+com.google.guava:guava:19.0
+com.googlecode.concurrent-trees:concurrent-trees:2.6.1
+com.googlecode.javaewah:JavaEWAH:1.1.6
+com.jcraft:jsch:0.1.55
+com.jcraft:jzlib:1.1.1
+com.netflix.nebula:gradle-lint-plugin:16.0.2
+com.netflix.nebula:nebula-gradle-interop:1.0.11
+commons-lang:commons-lang:2.6
+javax.inject:javax.inject:1
+junit:junit:4.12
+nebula.lint:nebula.lint.gradle.plugin:16.0.2
+net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:0.6.1
+net.ltgt.gradle:gradle-errorprone-plugin:0.6.1
+org.apache.commons:commons-lang3:3.8.1
+org.apache.maven:maven-artifact:3.6.2
+org.apache.maven:maven-builder-support:3.6.2
+org.apache.maven:maven-model-builder:3.6.2
+org.apache.maven:maven-model:3.6.2
+org.bouncycastle:bcpg-jdk15on:1.61
+org.bouncycastle:bcpkix-jdk15on:1.61
+org.bouncycastle:bcprov-jdk15on:1.61
+org.codehaus.gpars:gpars:1.2.1
+org.codehaus.groovy:groovy-xml:2.4.7
+org.codehaus.groovy:groovy:2.4.7
+org.codehaus.jsr166-mirror:jsr166y:1.7.0
+org.codehaus.plexus:plexus-interpolation:1.25
+org.codehaus.plexus:plexus-utils:3.2.1
+org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.sisu:org.eclipse.sisu.inject:0.3.3
+org.hamcrest:hamcrest-core:1.3
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
+org.jetbrains.kotlin:kotlin-stdlib:1.3.50
+org.jetbrains:annotations:13.0
+org.multiverse:multiverse-core:0.7.0
+org.ow2.asm:asm-analysis:7.1
+org.ow2.asm:asm-commons:7.1
+org.ow2.asm:asm-tree:7.1
+org.ow2.asm:asm:7.1
+org.slf4j:slf4j-api:1.7.2
--- a/buildSrc/gradle/dependency-locks/checkstyle.lockfile
+++ b/buildSrc/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,19 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:29.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.37
+commons-beanutils:commons-beanutils:1.9.4
+commons-collections:commons-collections:3.2.2
+info.picocli:picocli:4.5.2
+net.sf.saxon:Saxon-HE:10.3
+org.antlr:antlr4-runtime:4.8-1
+org.checkerframework:checker-qual:2.11.1
+org.javassist:javassist:3.26.0-GA
+org.reflections:reflections:0.9.12
--- a/buildSrc/gradle/dependency-locks/compile.lockfile
+++ b/buildSrc/gradle/dependency-locks/compile.lockfile
@@ -0,0 +1,63 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.8.0
+org.json:json:20160212
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/gradle/dependency-locks/compileClasspath.lockfile
+++ b/buildSrc/gradle/dependency-locks/compileClasspath.lockfile
@@ -0,0 +1,63 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.8.0
+org.json:json:20160212
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/gradle/dependency-locks/deploy_jar.lockfile
+++ b/buildSrc/gradle/dependency-locks/deploy_jar.lockfile
@@ -0,0 +1,63 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.8.0
+org.json:json:20160212
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/buildSrc/gradle/dependency-locks/jacocoAgent.lockfile
@@ -0,0 +1,4 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+org.jacoco:org.jacoco.agent:0.8.6
--- a/buildSrc/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/buildSrc/gradle/dependency-locks/jacocoAnt.lockfile
@@ -0,0 +1,11 @@
+# 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.
+org.jacoco:org.jacoco.agent:0.8.6
+org.jacoco:org.jacoco.ant:0.8.6
+org.jacoco:org.jacoco.core:0.8.6
+org.jacoco:org.jacoco.report:0.8.6
+org.ow2.asm:asm-analysis:8.0.1
+org.ow2.asm:asm-commons:8.0.1
+org.ow2.asm:asm-tree:8.0.1
+org.ow2.asm:asm:8.0.1
--- a/buildSrc/gradle/dependency-locks/runtime.lockfile
+++ b/buildSrc/gradle/dependency-locks/runtime.lockfile
@@ -0,0 +1,63 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.8.0
+org.json:json:20160212
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -0,0 +1,63 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.8.0
+org.json:json:20160212
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:7.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/gradle/dependency-locks/testAnnotationProcessor.lockfile
+++ b/buildSrc/gradle/dependency-locks/testAnnotationProcessor.lockfile
@@ -0,0 +1,27 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
+com.github.kevinstern:software-and-algorithms:1.0
+com.google.auto:auto-common:0.10
+com.google.code.findbugs:jFormatString:3.0.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:27.0.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.1
+com.google.protobuf:protobuf-java:3.4.0
+com.googlecode.java-diff-utils:diffutils:1.3.0
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0
--- a/buildSrc/gradle/dependency-locks/testCompile.lockfile
+++ b/buildSrc/gradle/dependency-locks/testCompile.lockfile
@@ -0,0 +1,78 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+junit:junit:4.13.1
+net.bytebuddy:byte-buddy-agent:1.10.19
+net.bytebuddy:byte-buddy:1.10.19
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.apiguardian:apiguardian-api:1.1.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.json:json:20160212
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.mockito:mockito-core:3.7.7
+org.objenesis:objenesis:3.1
+org.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -0,0 +1,78 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+junit:junit:4.13.1
+net.bytebuddy:byte-buddy-agent:1.10.19
+net.bytebuddy:byte-buddy:1.10.19
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.apiguardian:apiguardian-api:1.1.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.json:json:20160212
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.mockito:mockito-core:3.7.7
+org.objenesis:objenesis:3.1
+org.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/gradle/dependency-locks/testRuntime.lockfile
+++ b/buildSrc/gradle/dependency-locks/testRuntime.lockfile
@@ -0,0 +1,78 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+junit:junit:4.13.1
+net.bytebuddy:byte-buddy-agent:1.10.19
+net.bytebuddy:byte-buddy:1.10.19
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.apiguardian:apiguardian-api:1.1.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.json:json:20160212
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.mockito:mockito-core:3.7.7
+org.objenesis:objenesis:3.1
+org.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -0,0 +1,78 @@
+# 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.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.12.1
+com.fasterxml.jackson:jackson-bom:2.12.1
+com.google.api-client:google-api-client:1.31.2
+com.google.api.grpc:proto-google-common-protos:2.1.0
+com.google.api.grpc:proto-google-iam-v1:1.0.10
+com.google.api:api-common:1.10.1
+com.google.api:gax-httpjson:0.79.0
+com.google.api:gax:1.62.0
+com.google.apis:google-api-services-storage:v1-rev20210127-1.31.0
+com.google.auth:google-auth-library-credentials:0.24.1
+com.google.auth:google-auth-library-oauth2-http:0.24.1
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.cloud:google-cloud-core-http:1.94.1
+com.google.cloud:google-cloud-core:1.94.3
+com.google.cloud:google-cloud-storage:1.113.12
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.8.6
+com.google.common.html.types:types:1.0.6
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.escapevelocity:escapevelocity:0.9.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-apache-v2:1.39.0
+com.google.http-client:google-http-client-appengine:1.39.0
+com.google.http-client:google-http-client-gson:1.39.0
+com.google.http-client:google-http-client-jackson2:1.39.0
+com.google.http-client:google-http-client:1.39.0
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.jsinterop:jsinterop-annotations:1.0.1
+com.google.oauth-client:google-oauth-client:1.31.4
+com.google.protobuf:protobuf-java-util:3.15.3
+com.google.protobuf:protobuf-java:3.15.3
+com.google.template:soy:2021-02-01
+com.google.truth.extensions:truth-java8-extension:1.1.2
+com.google.truth:truth:1.1.2
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.36.0
+io.opencensus:opencensus-api:0.28.0
+io.opencensus:opencensus-contrib-http-util:0.28.0
+javax.annotation:javax.annotation-api:1.3.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+junit:junit:4.13.1
+net.bytebuddy:byte-buddy-agent:1.10.19
+net.bytebuddy:byte-buddy:1.10.19
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpcore:4.4.14
+org.apiguardian:apiguardian-api:1.1.0
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.json:json:20160212
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.mockito:mockito-core:3.7.7
+org.objenesis:objenesis:3.1
+org.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm:9.0
+org.threeten:threetenbp:1.5.0
--- a/buildSrc/src/main/java/google/registry/gradle/plugin/ProjectData.java
+++ b/buildSrc/src/main/java/google/registry/gradle/plugin/ProjectData.java
@@ -17,6 +17,7 @@ package google.registry.gradle.plugin;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import google.registry.gradle.plugin.ProjectData.TaskData;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
--- a/buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploader.java
+++ b/buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploader.java
@@ -143,7 +143,7 @@ public class ReportUploader extends DefaultTask {
          .getAsMap()
          .forEach(
              (type, report) -> {
-                File destination = report.getOutputLocation().get().getAsFile();
+                File destination = report.getDestination();
                // The destination could be a file, or a directory. If it's a directory - the Report
                // could have created multiple files - and we need to know to which one of those to
                // link.
--- a/buildscript-gradle.lockfile
+++ b/buildscript-gradle.lockfile
@@ -1,63 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.diffplug.durian:durian-collect:1.2.0=classpath
-com.diffplug.durian:durian-core:1.2.0=classpath
-com.diffplug.durian:durian-io:1.2.0=classpath
-com.diffplug.durian:durian-swt.os:4.2.0=classpath
-com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:6.20.0=classpath
-com.diffplug.spotless:spotless-lib-extra:2.40.0=classpath
-com.diffplug.spotless:spotless-lib:2.40.0=classpath
-com.diffplug.spotless:spotless-plugin-gradle:6.20.0=classpath
-com.dorongold.plugins:task-tree:2.1.0=classpath
-com.dorongold.task-tree:com.dorongold.task-tree.gradle.plugin:2.1.0=classpath
-com.github.jengelman.gradle.plugins:shadow:5.1.0=classpath
-com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:5.1.0=classpath
-com.github.node-gradle.node:com.github.node-gradle.node.gradle.plugin:3.0.1=classpath
-com.github.node-gradle:gradle-node-plugin:3.0.1=classpath
-com.google.cloud.tools:appengine-gradle-plugin:2.4.1=classpath
-com.google.cloud.tools:appengine-plugins-core:0.9.1=classpath
-com.google.code.findbugs:jsr305:3.0.2=classpath
-com.google.code.gson:gson:2.8.6=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
-com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.2-jre=classpath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
-com.google.j2objc:j2objc-annotations:1.3=classpath
-com.googlecode.concurrent-trees:concurrent-trees:2.6.1=classpath
-com.googlecode.javaewah:JavaEWAH:1.2.3=classpath
-com.squareup.okhttp3:okhttp:4.10.0=classpath
-com.squareup.okio:okio-jvm:3.0.0=classpath
-com.squareup.okio:okio:3.0.0=classpath
-commons-io:commons-io:2.6=classpath
-dev.equo.ide:solstice:1.3.1=classpath
-net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:2.0.2=classpath
-net.ltgt.gradle:gradle-errorprone-plugin:2.0.2=classpath
-org.apache.ant:ant-launcher:1.9.7=classpath
-org.apache.ant:ant:1.9.7=classpath
-org.apache.commons:commons-compress:1.20=classpath
-org.apache.commons:commons-lang3:3.5=classpath
-org.checkerframework:checker-qual:2.10.0=classpath
-org.codehaus.plexus:plexus-utils:3.0.24=classpath
-org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r=classpath
-org.eclipse.platform:org.eclipse.osgi:3.18.300=classpath
-org.glassfish:javax.json:1.0.4=classpath
-org.jdom:jdom2:2.0.6=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.6.20=classpath
-org.jetbrains:annotations:13.0=classpath
-org.ow2.asm:asm-analysis:7.0-beta=classpath
-org.ow2.asm:asm-commons:7.0-beta=classpath
-org.ow2.asm:asm-tree:7.0-beta=classpath
-org.ow2.asm:asm:7.0-beta=classpath
-org.slf4j:slf4j-api:1.7.36=classpath
-org.sonatype.aether:aether-api:1.13.1=classpath
-org.sonatype.aether:aether-impl:1.13.1=classpath
-org.sonatype.aether:aether-spi:1.13.1=classpath
-org.sonatype.aether:aether-util:1.13.1=classpath
-org.tukaani:xz:1.9=classpath
-org.vafer:jdependency:2.1.1=classpath
-org.yaml:snakeyaml:1.21=classpath
-empty=
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -28,18 +28,15 @@ sourceSets {
 }

 configurations {
-  // For reasons I don't understand, testingCompileOnly is the configuration
-  // used for compiling the classes in the "testing" jar.
-  testingCompileOnly.extendsFrom implementation
-  testingRuntimeOnly.extendsFrom runtimeOnly
+  testingCompile.extendsFrom compile
+  testingRuntime.extendsFrom runtime

-  testImplementation.extendsFrom testingCompile
-  testRuntimeOnly.extendsFrom testingRuntime
+  testCompile.extendsFrom testingCompile
+  testRuntime.extendsFrom testingRuntime

  // All testing util classes. Other projects may declare dependency as:
-  // testImplementation project(path: 'common', configuration: 'testing')
-  create("testing")
-  testing.extendsFrom testingCompileOnly
+  // testCompile project(path: 'common', configuration: 'testing')
+  testing
 }

 task testingJar(type: Jar) {
@@ -54,15 +51,16 @@ artifacts {
 dependencies {
  def deps = rootProject.dependencyMap

-  implementation deps['com.github.ben-manes.caffeine:caffeine']
-  implementation deps['com.google.code.findbugs:jsr305']
-  implementation deps['com.google.guava:guava']
-  implementation deps['javax.inject:javax.inject']
-  implementation deps['joda-time:joda-time']
-  implementation deps['com.google.flogger:flogger']
-  implementation deps['io.github.java-diff-utils:java-diff-utils']
-  implementation deps['com.google.truth:truth']
+  compile deps['com.google.code.findbugs:jsr305']
+  compile deps['com.google.guava:guava']
+  compile deps['javax.inject:javax.inject']
+  compile deps['joda-time:joda-time']

-  testImplementation deps['org.junit.jupiter:junit-jupiter-api']
-  testImplementation deps['org.junit.jupiter:junit-jupiter-engine']
+  testingCompile deps['com.google.flogger:flogger']
+  testingRuntime deps['com.google.flogger:flogger-system-backend']
+  testingCompile deps['com.google.truth:truth']
+  testingCompile deps['io.github.java-diff-utils:java-diff-utils']
+
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
+  testCompile deps['org.junit.jupiter:junit-jupiter-engine']
 }
--- a/common/gradle.lockfile
+++ b/common/gradle.lockfile
@@ -1,69 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.github.ben-manes.caffeine:caffeine:2.7.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.github.ben-manes.caffeine:caffeine:2.9.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.auto.value:auto-value-annotations:1.10.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.auto:auto-common:0.10=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath
-com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.19.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.7.1=checkstyle
-com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.errorprone:error_prone_core:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.errorprone:error_prone_type_annotations:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.flogger:flogger:0.7.4=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.guava:failureaccess:1.0.1=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath
-com.google.guava:guava-parent:32.1.2-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.guava:guava:31.0.1-jre=checkstyle
-com.google.guava:guava:32.1.2-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,testing,testingAnnotationProcessor,testingCompileClasspath
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.3=checkstyle
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath,testingCompileClasspath
-com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.truth:truth:1.1.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-com.googlecode.java-diff-utils:diffutils:1.3.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.puppycrawl.tools:checkstyle:9.3=checkstyle
-commons-beanutils:commons-beanutils:1.9.4=checkstyle
-commons-collections:commons-collections:3.2.2=checkstyle
-info.picocli:picocli:4.6.2=checkstyle
-io.github.java-diff-utils:java-diff-utils:4.12=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-javax.inject:javax.inject:1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-joda-time:joda-time:2.12.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-net.sf.saxon:Saxon-HE:10.6=checkstyle
-org.antlr:antlr4-runtime:4.9.3=checkstyle
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-org.checkerframework:checker-qual:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-org.checkerframework:checker-qual:3.12.0=checkstyle
-org.checkerframework:checker-qual:3.35.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-org.jacoco:org.jacoco.agent:0.8.9=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.9=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.9=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.9=jacocoAnt
-org.javassist:javassist:3.28.0-GA=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.10.0=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-commons:9.5=jacocoAnt
-org.ow2.asm:asm-tree:9.5=jacocoAnt
-org.ow2.asm:asm:9.5=compileClasspath,deploy_jar,jacocoAnt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
-org.pcollections:pcollections:2.1.2=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-org.plumelib:plume-util:1.0.6=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-org.plumelib:reflection-util:0.0.2=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-org.plumelib:require-javadoc:0.1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-org.reflections:reflections:0.10.2=checkstyle
-empty=errorproneJavac,testingCompile,testingRuntime,testingRuntimeClasspath
--- a/common/gradle/dependency-locks/annotationProcessor.lockfile
+++ b/common/gradle/dependency-locks/annotationProcessor.lockfile
@@ -0,0 +1,27 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
+com.github.kevinstern:software-and-algorithms:1.0
+com.google.auto:auto-common:0.10
+com.google.code.findbugs:jFormatString:3.0.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:27.0.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.1
+com.google.protobuf:protobuf-java:3.4.0
+com.googlecode.java-diff-utils:diffutils:1.3.0
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0
--- a/common/gradle/dependency-locks/archives.lockfile
+++ b/common/gradle/dependency-locks/archives.lockfile
@@ -1,4 +1,3 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-empty=classpath
--- a/common/gradle/dependency-locks/buildscript-classpath.lockfile
+++ b/common/gradle/dependency-locks/buildscript-classpath.lockfile
@@ -1,4 +1,3 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-empty=classpath
--- a/common/gradle/dependency-locks/checkstyle.lockfile
+++ b/common/gradle/dependency-locks/checkstyle.lockfile
@@ -0,0 +1,19 @@
+# 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.
+antlr:antlr:2.7.7
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:29.0-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.37
+commons-beanutils:commons-beanutils:1.9.4
+commons-collections:commons-collections:3.2.2
+info.picocli:picocli:4.5.2
+net.sf.saxon:Saxon-HE:10.3
+org.antlr:antlr4-runtime:4.8-1
+org.checkerframework:checker-qual:2.11.1
+org.javassist:javassist:3.26.0-GA
+org.reflections:reflections:0.9.12
--- a/common/gradle/dependency-locks/compile.lockfile
+++ b/common/gradle/dependency-locks/compile.lockfile
@@ -0,0 +1,12 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+org.checkerframework:checker-qual:3.8.0
--- a/common/gradle/dependency-locks/compileClasspath.lockfile
+++ b/common/gradle/dependency-locks/compileClasspath.lockfile
@@ -0,0 +1,12 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+org.checkerframework:checker-qual:3.8.0
--- a/common/gradle/dependency-locks/compileOnly.lockfile
+++ b/common/gradle/dependency-locks/compileOnly.lockfile
@@ -1,4 +1,3 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-empty=classpath
--- a/common/gradle/dependency-locks/default.lockfile
+++ b/common/gradle/dependency-locks/default.lockfile
@@ -0,0 +1,12 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+org.checkerframework:checker-qual:3.8.0
--- a/common/gradle/dependency-locks/deploy_jar.lockfile
+++ b/common/gradle/dependency-locks/deploy_jar.lockfile
@@ -0,0 +1,12 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+org.checkerframework:checker-qual:3.8.0
--- a/common/gradle/dependency-locks/errorprone.lockfile
+++ b/common/gradle/dependency-locks/errorprone.lockfile
@@ -0,0 +1,27 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
+com.github.kevinstern:software-and-algorithms:1.0
+com.google.auto:auto-common:0.10
+com.google.code.findbugs:jFormatString:3.0.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:27.0.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.1
+com.google.protobuf:protobuf-java:3.4.0
+com.googlecode.java-diff-utils:diffutils:1.3.0
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0
--- a/common/gradle/dependency-locks/errorproneJavac.lockfile
+++ b/common/gradle/dependency-locks/errorproneJavac.lockfile
@@ -1,4 +1,3 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-empty=classpath
--- a/common/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/common/gradle/dependency-locks/jacocoAgent.lockfile
@@ -0,0 +1,4 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+org.jacoco:org.jacoco.agent:0.8.6
--- a/common/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/common/gradle/dependency-locks/jacocoAnt.lockfile
@@ -0,0 +1,11 @@
+# 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.
+org.jacoco:org.jacoco.agent:0.8.6
+org.jacoco:org.jacoco.ant:0.8.6
+org.jacoco:org.jacoco.core:0.8.6
+org.jacoco:org.jacoco.report:0.8.6
+org.ow2.asm:asm-analysis:8.0.1
+org.ow2.asm:asm-commons:8.0.1
+org.ow2.asm:asm-tree:8.0.1
+org.ow2.asm:asm:8.0.1
--- a/common/gradle/dependency-locks/runtime.lockfile
+++ b/common/gradle/dependency-locks/runtime.lockfile
@@ -0,0 +1,12 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+org.checkerframework:checker-qual:3.8.0
--- a/common/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -0,0 +1,12 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+org.checkerframework:checker-qual:3.8.0
--- a/common/gradle/dependency-locks/testAnnotationProcessor.lockfile
+++ b/common/gradle/dependency-locks/testAnnotationProcessor.lockfile
@@ -0,0 +1,27 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
+com.github.kevinstern:software-and-algorithms:1.0
+com.google.auto:auto-common:0.10
+com.google.code.findbugs:jFormatString:3.0.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:27.0.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.1
+com.google.protobuf:protobuf-java:3.4.0
+com.googlecode.java-diff-utils:diffutils:1.3.0
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0
--- a/common/gradle/dependency-locks/testCompile.lockfile
+++ b/common/gradle/dependency-locks/testCompile.lockfile
@@ -0,0 +1,27 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger:0.7.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.google.truth:truth:1.1.2
+io.github.java-diff-utils:java-diff-utils:4.9
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+junit:junit:4.13.1
+org.apiguardian:apiguardian-api:1.1.0
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm:9.0
--- a/common/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/common/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -0,0 +1,27 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger:0.7.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.google.truth:truth:1.1.2
+io.github.java-diff-utils:java-diff-utils:4.9
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+junit:junit:4.13.1
+org.apiguardian:apiguardian-api:1.1.0
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm:9.0
--- a/common/gradle/dependency-locks/testCompileOnly.lockfile
+++ b/common/gradle/dependency-locks/testCompileOnly.lockfile
@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
--- a/common/gradle/dependency-locks/testRuntime.lockfile
+++ b/common/gradle/dependency-locks/testRuntime.lockfile
@@ -0,0 +1,28 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.google.truth:truth:1.1.2
+io.github.java-diff-utils:java-diff-utils:4.9
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+junit:junit:4.13.1
+org.apiguardian:apiguardian-api:1.1.0
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm:9.0
--- a/common/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -0,0 +1,28 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.google.truth:truth:1.1.2
+io.github.java-diff-utils:java-diff-utils:4.9
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+junit:junit:4.13.1
+org.apiguardian:apiguardian-api:1.1.0
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.junit.jupiter:junit-jupiter-api:5.6.2
+org.junit.jupiter:junit-jupiter-engine:5.6.2
+org.junit.platform:junit-platform-commons:1.6.2
+org.junit.platform:junit-platform-engine:1.6.2
+org.junit:junit-bom:5.6.2
+org.opentest4j:opentest4j:1.2.0
+org.ow2.asm:asm:9.0
--- a/common/gradle/dependency-locks/testing.lockfile
+++ b/common/gradle/dependency-locks/testing.lockfile
@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
--- a/common/gradle/dependency-locks/testingAnnotationProcessor.lockfile
+++ b/common/gradle/dependency-locks/testingAnnotationProcessor.lockfile
@@ -0,0 +1,27 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.7.0
+com.github.kevinstern:software-and-algorithms:1.0
+com.google.auto:auto-common:0.10
+com.google.code.findbugs:jFormatString:3.0.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotation:2.3.4
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_check_api:2.3.4
+com.google.errorprone:error_prone_core:2.3.4
+com.google.errorprone:error_prone_type_annotations:2.3.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:27.0.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.1
+com.google.protobuf:protobuf-java:3.4.0
+com.googlecode.java-diff-utils:diffutils:1.3.0
+org.checkerframework:checker-qual:3.0.0
+org.checkerframework:dataflow:3.0.0
+org.checkerframework:javacutil:3.0.0
+org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.pcollections:pcollections:2.1.2
+org.plumelib:plume-util:1.0.6
+org.plumelib:reflection-util:0.0.2
+org.plumelib:require-javadoc:0.1.0
--- a/common/gradle/dependency-locks/testingCompile.lockfile
+++ b/common/gradle/dependency-locks/testingCompile.lockfile
@@ -0,0 +1,20 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger:0.7.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.google.truth:truth:1.1.2
+io.github.java-diff-utils:java-diff-utils:4.9
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+junit:junit:4.13.1
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.ow2.asm:asm:9.0
--- a/common/gradle/dependency-locks/testingCompileClasspath.lockfile
+++ b/common/gradle/dependency-locks/testingCompileClasspath.lockfile
@@ -0,0 +1,20 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger:0.7.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.google.truth:truth:1.1.2
+io.github.java-diff-utils:java-diff-utils:4.9
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+junit:junit:4.13.1
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.ow2.asm:asm:9.0
--- a/common/gradle/dependency-locks/testingCompileOnly.lockfile
+++ b/common/gradle/dependency-locks/testingCompileOnly.lockfile
@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
--- a/common/gradle/dependency-locks/testingRuntime.lockfile
+++ b/common/gradle/dependency-locks/testingRuntime.lockfile
@@ -0,0 +1,21 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.google.truth:truth:1.1.2
+io.github.java-diff-utils:java-diff-utils:4.9
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+junit:junit:4.13.1
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.ow2.asm:asm:9.0
--- a/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile
@@ -0,0 +1,21 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.auto.value:auto-value-annotations:1.7.4
+com.google.code.findbugs:jsr305:3.0.2
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.flogger:flogger-system-backend:0.7.4
+com.google.flogger:flogger:0.7.4
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:30.1.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.j2objc:j2objc-annotations:1.3
+com.google.truth:truth:1.1.2
+io.github.java-diff-utils:java-diff-utils:4.9
+javax.inject:javax.inject:1
+joda-time:joda-time:2.9.2
+junit:junit:4.13.1
+org.checkerframework:checker-compat-qual:2.5.3
+org.checkerframework:checker-qual:3.9.1
+org.hamcrest:hamcrest-core:1.3
+org.ow2.asm:asm:9.0
--- a/common/src/main/java/google/registry/util/DateTimeUtils.java
+++ b/common/src/main/java/google/registry/util/DateTimeUtils.java
@@ -19,13 +19,15 @@ import static com.google.common.base.Preconditions.checkArgument;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
-import java.sql.Date;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.TimeZone;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;

 /** Utilities methods and constants related to Joda {@link DateTime} objects. */
-public abstract class DateTimeUtils {
+public class DateTimeUtils {

  /** The start of the epoch, in a convenient constant. */
  public static final DateTime START_OF_TIME = new DateTime(0, DateTimeZone.UTC);
@@ -35,7 +37,7 @@ public abstract class DateTimeUtils {
   *
   * <p>This value is (2^63-1)/1000 rounded down. AppEngine stores dates as 64 bit microseconds, but
   * Java uses milliseconds, so this is the largest representable date that will survive a
-   * round-trip through the database.
+   * round-trip through Datastore.
   */
  public static final DateTime END_OF_TIME = new DateTime(Long.MAX_VALUE / 1000, DateTimeZone.UTC);

@@ -89,11 +91,39 @@ public abstract class DateTimeUtils {
    return years == 0 ? now : now.minusYears(1).minusYears(years - 1);
  }

-  public static Date toSqlDate(LocalDate localDate) {
-    return new Date(localDate.toDateTimeAtStartOfDay().getMillis());
+  /**
+   * Converts a Joda {@link DateTime} object to an equivalent java.time {@link ZonedDateTime}
+   * object.
+   */
+  public static ZonedDateTime toZonedDateTime(DateTime dateTime) {
+    java.time.Instant instant = java.time.Instant.ofEpochMilli(dateTime.getMillis());
+    return ZonedDateTime.ofInstant(instant, ZoneId.of(dateTime.getZone().getID()).normalized());
  }

-  public static LocalDate toLocalDate(Date date) {
+  /**
+   * Converts a Joda {@link DateTime} object to an equivalent java.time {@link ZonedDateTime}
+   * object.
+   */
+  public static ZonedDateTime toZonedDateTime(DateTime dateTime, ZoneId zoneId) {
+    java.time.Instant instant = java.time.Instant.ofEpochMilli(dateTime.getMillis());
+    return ZonedDateTime.ofInstant(instant, zoneId);
+  }
+
+  /**
+   * Converts a java.time {@link ZonedDateTime} object to an equivalent Joda {@link DateTime}
+   * object.
+   */
+  public static DateTime toJodaDateTime(ZonedDateTime zonedDateTime) {
+    return new DateTime(
+        zonedDateTime.toInstant().toEpochMilli(),
+        DateTimeZone.forTimeZone(TimeZone.getTimeZone(zonedDateTime.getZone())));
+  }
+
+  public static java.sql.Date toSqlDate(LocalDate localDate) {
+    return new java.sql.Date(localDate.toDateTimeAtStartOfDay().getMillis());
+  }
+
+  public static LocalDate toLocalDate(java.sql.Date date) {
    return new LocalDate(date.getTime(), DateTimeZone.UTC);
  }
 }
--- a/common/src/test/resources/google/registry/testing/truth/text-diff-expected.txt
+++ b/common/src/test/resources/google/registry/testing/truth/text-diff-expected.txt
@@ -1,2 +1,3 @@
 This is a random file,
-with three lines and terminates without a newline.
+
+with three lines and terminates without a newline.
--- a/common/src/test/resources/google/registry/testing/truth/text-sidebyside-diff.txt
+++ b/common/src/test/resources/google/registry/testing/truth/text-sidebyside-diff.txt
@@ -1,4 +1,5 @@
 |Expected                                              |Actual                                               |
 |------------------------------------------------------|-----------------------------------------------------|
 |This is a random file,                                |This is a random file,                               |
-|with ~three~ lines and terminates ~without~ a newline.|with **two** lines and terminates **with** a newline.|
+|                                                      |with **two** lines and terminates **with** a newline.|
+|with ~three~ lines and terminates ~without~ a newline.|                                                     |
--- a/common/src/test/resources/google/registry/testing/truth/text-unified-diff.txt
+++ b/common/src/test/resources/google/registry/testing/truth/text-unified-diff.txt
@@ -1,5 +1,6 @@
 --- expected
 +++ actual
-@@ -2,1 +2,1 @@
+@@ -2,2 +2,1 @@
+-
 -with three lines and terminates without a newline.
 +with two lines and terminates with a newline.
--- a/common/src/testing/java/google/registry/testing/SystemInfo.java
+++ b/common/src/testing/java/google/registry/testing/SystemInfo.java
@@ -14,9 +14,9 @@

 package google.registry.testing;

-import com.github.benmanes.caffeine.cache.CacheLoader;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.flogger.FluentLogger;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -29,7 +29,7 @@ public final class SystemInfo {
  private static final FluentLogger logger = FluentLogger.forEnclosingClass();

  private static final LoadingCache<String, Boolean> hasCommandCache =
-      Caffeine.newBuilder()
+      CacheBuilder.newBuilder()
          .build(
              new CacheLoader<String, Boolean>() {
                @Override
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -43,6 +43,12 @@ by Joshua Bloch in his book Effective Java -->
    <property name="message" value='Your Javadocs appear to use invalid &lt;a&gt; tag syntax in @see tags. Please use the correct syntax: @see &lt;a href="http(s)://your_url"&gt;url_description&lt;/a&gt;'/>
  </module>

+  <!-- Checks that our Ofy wrapper is used instead of the "real" ofy(). -->
+  <module name="RegexpSingleline">
+    <property name="format" value="com\.googlecode\.objectify\.ObjectifyService\.ofy"/>
+    <property name="message" value="Use google.registry.model.ofy.ObjectifyService.ofy(). Do not use com.googlecode.objectify.v4.ObjectifyService.ofy()."/>
+  </module>
+
  <!-- Checks that java.util.Optional is used instead of Guava's Optional. -->
  <module name="RegexpSingleline">
    <property name="format" value="com\.google\.common\.base\.Optional"/>
@@ -52,7 +58,13 @@ by Joshua Bloch in his book Effective Java -->
  <!-- Checks that the deprecated ExpectedException is not used. -->
  <module name="RegexpSingleline">
    <property name="format" value="org\.junit\.rules\.ExpectedException"/>
-    <property name="message" value="Use assertThrows and expectThrows instead of the deprecated methods on ExpectedException."/>
+    <property name="message" value="Use assertThrows and expectThrows from JUnitBackports instead of the deprecated methods on ExpectedException."/>
+  </module>
+
+  <!-- Checks that the deprecated MockitoJUnitRunner is not used. -->
+  <module name="RegexpSingleline">
+    <property name="format" value="MockitoJUnitRunner"/>
+    <property name="message" value="MockitoJUnitRunner is deprecated. Use @RunWith(JUnit4.class) and MockitoRule instead."/>
  </module>

  <module name="LineLength">
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -9,4 +9,6 @@
  <suppress files="[/\\].*[/\\]generated.*[/\\]" checks="."/>
  <!-- Ignore Javadoc checks in test files -->
  <suppress files="[/\\].*[/\\]src/test/java/.*[/\\]" checks="JavadocType"/>
+  <!-- ofy() regex check doesn't apply to these files -->
+  <suppress files="AugmentedDeleter.java|AugmentedSaver.java|Ofy.java" checks="RegexpSingleline"/>
 </suppressions>
--- a/config/dependency-license/allowed_licenses.json
+++ b/config/dependency-license/allowed_licenses.json
@@ -69,12 +69,6 @@
    {
      "moduleLicense": "BSD 3-clause New License"
    },
-    {
-      "moduleLicense": "BSD-3-Clause"
-    },
-    {
-      "moduleLicense": "BSD-3-Clause;link=\"https://raw.githubusercontent.com/dnsjava/dnsjava/master/LICENSE\""
-    },
    {
      "moduleLicense": "3-Clause BSD License"
    },
@@ -117,9 +111,6 @@
    {
      "moduleLicense": "The PostgreSQL License"
    },
-    {
-      "moduleLicense": "CC0"
-    },
    {
      "moduleLicense": "CC0 1.0 Universal License"
    },
@@ -207,9 +198,6 @@
    {
      "moduleLicense": "GNU Library General Public License v2.1 or later"
    },
-    {
-      "moduleLicense": "GNU Lesser General Public License v3.0"
-    },
    // This is just 3-clause BSD.
    {
      "moduleLicense": "Go License"
@@ -270,16 +258,6 @@
      "moduleLicense": "Public Domain",
      "moduleName": "org.tukaani:xz"
    },
-    {
-      "moduleLicense": "Public Domain",
-      "moduleName": "org.json:json"
-    },
-    {
-      // "Apache License, Version 2.0".
-      "moduleLicense": null,
-      "moduleVersion": "2.10.0",
-      "moduleName": "com.google.gwt:gwt-user"
-    },
    {
      // "Apache License, Version 2.0". The plugin is able to parse up to
      // 2.11.3 correctly but then something changed with 2.12.* and it no
@@ -287,19 +265,6 @@
      "moduleLicense": null,
      "moduleName": "com.fasterxml.jackson:jackson-bom"
    },
-    {
-      // Part of Guava with "Apache License, Version 2.0". The plugin is unable
-      // to parse its license for unknown reason.
-      "moduleLicense": null,
-      "moduleName": "com.google.guava:guava-parent"
-    },
-    {
-      // "Apache License, Version 2.0". The plugin is able to parse up to
-      // 2.0.33.Final but not this verson.
-      "moduleLicense": null,
-      "moduleVersion": "2.0.46.Final",
-      "moduleName": "io.netty:netty-tcnative-classes"
-    },
    {
      // Actually Eclipse Public License v2.0
      "moduleLicense": null,
--- a/config/nom_build.py
+++ b/config/nom_build.py
@@ -57,7 +57,6 @@ PROPERTIES_HEADER = """\
 #
 # DO NOT EDIT THIS FILE BY HAND
 org.gradle.jvmargs=-Xmx1024m
-org.gradle.caching=true
 """

 # Help text to be displayed (in addition to the synopsis and flag help, which
@@ -84,10 +83,6 @@ PROPERTIES = [
    Property('pluginsUrl',
             'URL to use for the gradle plugins repository (defaults to maven '
             'central, see also mavenUrl'),
-    Property('allowInsecureProtocol',
-             'Allow connecting to plain HTTP repositories.  This is provided '
-             'to allow us to communicate to a local proxy when doing '
-             'dependency updates.'),
    Property('uploaderDestination',
             'Location to upload test reports to.  Normally this should be a '
             'GCS url (see also uploaderCredentialsFile)'),
--- a/config/presubmits.py
+++ b/config/presubmits.py
@@ -25,7 +25,7 @@ import textwrap
 import re

 # We should never analyze any generated files
-UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "cloudbuild-caches", "/out/", ".git/", ".gradle/", "/dist/", "karma.conf.js", "polyfills.ts", "test.ts", "/docs/console-endpoints/"}
+UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "cloudbuild-caches", "/out/", ".git/", ".gradle/"}
 # We can't rely on CI to have the Enum package installed so we do this instead.
 FORBIDDEN = 1
 REQUIRED = 2
@@ -86,7 +86,7 @@ PRESUBMITS = {
    # License check
    PresubmitCheck(
        r".*Copyright 20\d{2} The Nomulus Authors\. All Rights Reserved\.",
-        ("java", "js", "soy", "sql", "py", "sh", "gradle", "ts"), {
+        ("java", "js", "soy", "sql", "py", "sh", "gradle"), {
            ".git", "/build/", "/generated/", "/generated_tests/",
            "node_modules/", "LoggerConfig.java", "registrar_bin.",
            "registrar_dbg.", "google-java-format-diff.py",
@@ -95,7 +95,7 @@ PRESUBMITS = {
        "File did not include the license header.",

    # Files must end in a newline
-    PresubmitCheck(r".*\n$", ("java", "js", "soy", "sql", "py", "sh", "gradle", "ts"),
+    PresubmitCheck(r".*\n$", ("java", "js", "soy", "sql", "py", "sh", "gradle"),
                   {"node_modules/"}, REQUIRED):
        "Source files must end in a newline.",

@@ -109,6 +109,22 @@ PRESUBMITS = {
        "System.(out|err).println is only allowed in tools/ packages. Please "
        "use a logger instead.",

+    # ObjectifyService.register is restricted to main/ or AppEngineExtension.
+    PresubmitCheck(
+        r".*\bObjectifyService\.register", "java", {
+            "/build/", "/generated/", "node_modules/", "src/main/",
+            "AppEngineExtension.java"
+        }):
+      "ObjectifyService.register(...) is not allowed in tests. Please use "
+      "AppEngineExtension.register(...) instead.",
+
+    # PostgreSQLContainer instantiation must specify docker tag
+    # TODO(b/204572437): Fix the pattern to pass DatabaseSnapshotTest.java
+    PresubmitCheck(
+        r"[\s\S]*new\s+PostgreSQLContainer(<[\s\S]*>)?\(\s*\)[\s\S]*",
+        "java", {"DatabaseSnapshotTest.java"}):
+      "PostgreSQLContainer instantiation must specify docker tag.",
+
    # Various Soy linting checks
    PresubmitCheck(
        r".* (/\*)?\* {?@param ",
--- a/config/show_upgrade_diffs.py
+++ b/config/show_upgrade_diffs.py
@@ -58,10 +58,7 @@ def parse_lockfile(filename: str) -> PackageMap:
        if line.startswith(b'#'):
            continue
        line = line.rstrip()
-        package = line.split(b'=')[0]
-        if package == 'empty':
-            continue
-        package = cast(Tuple[bytes, bytes, bytes], tuple(package.split(b':')))
+        package = cast(Tuple[bytes, bytes, bytes], tuple(line.split(b':')))
        result.setdefault(package[:-1], set()).add(package[-1])
    return result

--- a/console-webapp/.editorconfig
+++ b/console-webapp/.editorconfig
@@ -1,16 +0,0 @@
-# Editor configuration, see https://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.ts]
-quote_type = single
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false
--- a/console-webapp/.eslintrc.json
+++ b/console-webapp/.eslintrc.json
@@ -1,47 +0,0 @@
-{
-  "root": true,
-  "ignorePatterns": [
-    "projects/**/*"
-  ],
-  "overrides": [
-    {
-      "files": [
-        "*.ts"
-      ],
-      "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:@angular-eslint/recommended",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
-      "rules": {
-        "@angular-eslint/directive-selector": [
-          "error",
-          {
-            "type": "attribute",
-            "prefix": "app",
-            "style": "camelCase"
-          }
-        ],
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "type": "element",
-            "prefix": "app",
-            "style": "kebab-case"
-          }
-        ],
-        "eol-last": ["error", "always"]
-      }
-    },
-    {
-      "files": [
-        "*.html"
-      ],
-      "extends": [
-        "plugin:@angular-eslint/template/recommended"
-      ],
-      "rules": {}
-    }
-  ]
-}
--- a/console-webapp/.gitignore
+++ b/console-webapp/.gitignore
@@ -1,42 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# Compiled output
-/dist
-/tmp
-/out-tsc
-/bazel-out
-
-# Node
-/node_modules
-npm-debug.log
-yarn-error.log
-
-# IDEs and editors
-.idea/
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# Visual Studio Code
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-.history/*
-
-# Miscellaneous
-/.angular/cache
-.sass-cache/
-/connect.lock
-/coverage
-/libpeerconnection.log
-testem.log
-/typings
-
-# System files
-.DS_Store
-Thumbs.db
--- a/console-webapp/.prettierrc.json
+++ b/console-webapp/.prettierrc.json
@@ -1 +0,0 @@
-{}
--- a/console-webapp/README.md
+++ b/console-webapp/README.md
@@ -1,52 +0,0 @@
-# ConsoleWebapp
-
-A web application for managing [Nomulus](https://github.com/google/nomulus).
-
-## Status
-
-Console webapp is currently under active development and some parts of it are
-expected to change.
-
-## Deployment
-
-Webapp is deployed with the nomulus default service war to Google App Engine.
-During nomulus default service war build task, gradle script triggers the
-following:
-
-1) Console webapp build script `buildConsoleWebappProd`, which installs
-   dependencies, assembles a compiled ts -> js, minified, optimized static
-   artifact (html, css, js)
-2) Artifact assembled in step 1 then gets copied to core project web artifact
-   location, so that it can be deployed with the rest of the core webapp
-
-## Development server
-
-Run `npm run start:dev` to start both webapp dev server and API server instance.
-Navigate to `http://localhost:4200/`. The application will automatically reload
-if you change any of the source files.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can
-also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
-
-## Build
-
-Run `ng build` to build the project. The build artifacts will be stored in
-the `dist/` directory.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests
-via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To
-use this command, you need to first add a package that implements end-to-end
-testing capabilities.
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out
-the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
--- a/console-webapp/angular.json
+++ b/console-webapp/angular.json
@@ -1,130 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "newProjectRoot": "projects",
-  "projects": {
-    "console-webapp": {
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "dist/console-webapp",
-            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.app.json",
-            "inlineStyleLanguage": "scss",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/theme.scss",
-              "src/styles.scss"
-            ],
-            "stylePreprocessorOptions": {
-              "includePaths": ["node_modules/"]
-            },
-            "scripts": []
-          },
-          "configurations": {
-            "production": {
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
-                }
-              ],
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "outputHashing": "all"
-            },
-            "development": {
-              "buildOptimizer": false,
-              "optimization": false,
-              "vendorChunk": true,
-              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "configurations": {
-            "production": {
-              "browserTarget": "console-webapp:build:production"
-            },
-            "development": {
-              "browserTarget": "console-webapp:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "console-webapp:build"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
-            "inlineStyleLanguage": "scss",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/theme.scss",
-              "src/styles.scss"
-            ],
-            "stylePreprocessorOptions": {
-              "includePaths": ["node_modules/"]
-            },
-            "scripts": []
-          }
-        },
-        "lint": {
-          "builder": "@angular-eslint/builder:lint",
-          "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.html"
-            ]
-          }
-        }
-      }
-    }
-  },
-  "cli": {
-    "analytics": false,
-    "schematicCollections": [
-      "@angular-eslint/schematics"
-    ]
-  }
-}
--- a/console-webapp/build.gradle
+++ b/console-webapp/build.gradle
@@ -1,69 +0,0 @@
-// Copyright 2022 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.
-
-def consoleDir = "${rootDir}/console-webapp"
-
-clean {
-  delete "${consoleDir}/node_modules"
-  delete "${consoleDir}/dist"
-}
-
-task npmInstallDeps(type: Exec) {
-  workingDir "${consoleDir}/"
-  executable 'npm'
-  args 'i', '--no-audit', '--no-fund', '--loglevel=error'
-}
-
-task runConsoleWebappLocally(type: Exec) {
-  workingDir "${consoleDir}/"
-  executable 'npm'
-  args 'run', 'start:dev'
-}
-
-task runConsoleWebappUnitTests(type: Exec) {
-  workingDir "${consoleDir}/"
-  executable 'npm'
-  args 'run', 'test'
-}
-
-task buildConsoleWebappNonProd(type: Exec) {
-  workingDir "${consoleDir}/"
-  executable 'npm'
-  args 'run', 'build'
-}
-
-// Keeping the same as non prod for now before we figure out optimization we want to include
-task buildConsoleWebappProd(type: Exec) {
-  workingDir "${consoleDir}/"
-  executable 'npm'
-  args 'run', 'build'
-}
-
-task applyFormatting(type: Exec) {
-  workingDir "${consoleDir}/"
-  executable 'npm'
-  args 'run', 'prettify'
-}
-
-task checkFormatting(type: Exec) {
-  workingDir "${consoleDir}/"
-  executable 'npm'
-  args 'run', 'prettify:check'
-}
-
-tasks.runConsoleWebappUnitTests.dependsOn(tasks.npmInstallDeps)
-tasks.buildConsoleWebappProd.dependsOn(tasks.npmInstallDeps)
-tasks.applyFormatting.dependsOn(tasks.npmInstallDeps)
-tasks.checkFormatting.dependsOn(tasks.npmInstallDeps)
-tasks.build.dependsOn(tasks.checkFormatting)
--- a/console-webapp/dev-proxy.config.json
+++ b/console-webapp/dev-proxy.config.json
@@ -1,9 +0,0 @@
-{
-  "/console-api":
-  {
-    "target": "http://localhost:8080",
-    "secure": false,
-    "logLevel": "debug",
-    "changeOrigin": true
-  }
-}
--- a/console-webapp/gradle.lockfile
+++ b/console-webapp/gradle.lockfile
@@ -1,47 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.github.ben-manes.caffeine:caffeine:2.7.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.code.findbugs:jFormatString:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotation:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.7.1=checkstyle
-com.google.errorprone:error_prone_check_api:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_core:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:error_prone_type_annotations:2.3.4=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,checkstyle,errorprone,testAnnotationProcessor
-com.google.guava:guava:27.0.1-jre=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:guava:31.0.1-jre=checkstyle
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,errorprone,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.3=checkstyle
-com.google.protobuf:protobuf-java:3.4.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.googlecode.java-diff-utils:diffutils:1.3.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.puppycrawl.tools:checkstyle:9.3=checkstyle
-commons-beanutils:commons-beanutils:1.9.4=checkstyle
-commons-collections:commons-collections:3.2.2=checkstyle
-info.picocli:picocli:4.6.2=checkstyle
-net.sf.saxon:Saxon-HE:10.6=checkstyle
-org.antlr:antlr4-runtime:4.9.3=checkstyle
-org.checkerframework:checker-qual:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor
-org.checkerframework:checker-qual:3.12.0=checkstyle
-org.checkerframework:dataflow:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor
-org.checkerframework:javacutil:3.0.0=annotationProcessor,errorprone,testAnnotationProcessor
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,errorprone,testAnnotationProcessor
-org.jacoco:org.jacoco.agent:0.8.9=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.9=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.9=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.9=jacocoAnt
-org.javassist:javassist:3.28.0-GA=checkstyle
-org.ow2.asm:asm-commons:9.5=jacocoAnt
-org.ow2.asm:asm-tree:9.5=jacocoAnt
-org.ow2.asm:asm:9.5=jacocoAnt
-org.pcollections:pcollections:2.1.2=annotationProcessor,errorprone,testAnnotationProcessor
-org.plumelib:plume-util:1.0.6=annotationProcessor,errorprone,testAnnotationProcessor
-org.plumelib:reflection-util:0.0.2=annotationProcessor,errorprone,testAnnotationProcessor
-org.plumelib:require-javadoc:0.1.0=annotationProcessor,errorprone,testAnnotationProcessor
-org.reflections:reflections:0.10.2=checkstyle
-empty=compileClasspath,deploy_jar,errorproneJavac,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
--- a/console-webapp/karma.conf.js
+++ b/console-webapp/karma.conf.js
@@ -1,44 +0,0 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
-
-module.exports = function (config) {
-  config.set({
-    basePath: '',
-    frameworks: ['jasmine', '@angular-devkit/build-angular'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage'),
-      require('@angular-devkit/build-angular/plugins/karma')
-    ],
-    client: {
-      jasmine: {
-        // you can add configuration options for Jasmine here
-        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
-        // for example, you can disable the random execution with `random: false`
-        // or set a specific seed with `seed: 4321`
-      },
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
-    jasmineHtmlReporter: {
-      suppressAll: true // removes the duplicated traces
-    },
-    coverageReporter: {
-      dir: require('path').join(__dirname, './coverage/console-webapp'),
-      subdir: '.',
-      reporters: [
-        { type: 'html' },
-        { type: 'text-summary' }
-      ]
-    },
-    reporters: ['progress', 'kjhtml'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false,
-    restartOnFileChange: true
-  });
-};
--- a/console-webapp/package-lock.json
+++ b/console-webapp/package-lock.json
--- a/console-webapp/package.json
+++ b/console-webapp/package.json
@@ -1,57 +0,0 @@
-{
-  "name": "console-webapp",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve --proxy-config dev-proxy.config.json",
-    "build": "ng build --base-href=/console/",
-    "build:local": "ng build --base-href=/default/console/",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test --browsers=ChromeHeadless --watch=false",
-    "run:dev": "",
-    "prettify": "npx prettier --write ./src/",
-    "prettify:check": "npx prettier --check ./src/",
-    "start:dev": "concurrently \"./../gradlew :core:runTestServer\" \"ng serve --proxy-config dev-proxy.config.json\"",
-    "lint": "ng lint"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^15.2.2",
-    "@angular/cdk": "^15.2.2",
-    "@angular/common": "^15.2.2",
-    "@angular/compiler": "^15.2.2",
-    "@angular/core": "^15.2.2",
-    "@angular/forms": "^15.2.2",
-    "@angular/material": "^15.2.2",
-    "@angular/platform-browser": "^15.2.2",
-    "@angular/platform-browser-dynamic": "^15.2.2",
-    "@angular/router": "^15.2.2",
-    "rxjs": "~7.5.0",
-    "tslib": "^2.3.0",
-    "zone.js": "~0.11.4"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "^15.2.4",
-    "@angular-eslint/builder": "15.2.1",
-    "@angular-eslint/eslint-plugin": "15.2.1",
-    "@angular-eslint/eslint-plugin-template": "15.2.1",
-    "@angular-eslint/schematics": "15.2.1",
-    "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "~15.2.4",
-    "@angular/compiler-cli": "^15.2.2",
-    "@types/jasmine": "~4.0.0",
-    "@types/node": "^18.11.18",
-    "@typescript-eslint/eslint-plugin": "5.48.2",
-    "@typescript-eslint/parser": "5.48.2",
-    "concurrently": "^7.6.0",
-    "eslint": "^8.33.0",
-    "jasmine-core": "~4.3.0",
-    "karma": "~6.4.0",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "~2.2.0",
-    "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~2.0.0",
-    "prettier": "2.8.7",
-    "typescript": "~4.9.4"
-  }
-}
--- a/console-webapp/src/app/app-routing.module.ts
+++ b/console-webapp/src/app/app-routing.module.ts
@@ -1,79 +0,0 @@
-// Copyright 2023 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.
-
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { TldsComponent } from './tlds/tlds.component';
-import { HomeComponent } from './home/home.component';
-import { SettingsComponent } from './settings/settings.component';
-import SettingsContactComponent from './settings/contact/contact.component';
-import SettingsWhoisComponent from './settings/whois/whois.component';
-import SettingsUsersComponent from './settings/users/users.component';
-import SettingsSecurityComponent from './settings/security/security.component';
-import { RegistrarGuard } from './registrar/registrar.guard';
-import { RegistrarComponent } from './registrar/registrarsTable.component';
-import { EmptyRegistrar } from './registrar/emptyRegistrar.component';
-import ContactComponent from './settings/contact/contact.component';
-import WhoisComponent from './settings/whois/whois.component';
-import SecurityComponent from './settings/security/security.component';
-import UsersComponent from './settings/users/users.component';
-
-const routes: Routes = [
-  { path: '', redirectTo: '/home', pathMatch: 'full' },
-  { path: 'registrars', component: RegistrarComponent },
-  { path: 'empty-registrar', component: EmptyRegistrar },
-  { path: 'home', component: HomeComponent, canActivate: [RegistrarGuard] },
-  { path: 'tlds', component: TldsComponent, canActivate: [RegistrarGuard] },
-  {
-    path: SettingsComponent.PATH,
-    component: SettingsComponent,
-    children: [
-      {
-        path: '',
-        redirectTo: 'registrars',
-        pathMatch: 'full',
-      },
-      {
-        path: ContactComponent.PATH,
-        component: SettingsContactComponent,
-        canActivate: [RegistrarGuard],
-      },
-      {
-        path: WhoisComponent.PATH,
-        component: SettingsWhoisComponent,
-        canActivate: [RegistrarGuard],
-      },
-      {
-        path: SecurityComponent.PATH,
-        component: SettingsSecurityComponent,
-        canActivate: [RegistrarGuard],
-      },
-      {
-        path: UsersComponent.PATH,
-        component: SettingsUsersComponent,
-        canActivate: [RegistrarGuard],
-      },
-      {
-        path: RegistrarComponent.PATH,
-        component: RegistrarComponent,
-      },
-    ],
-  },
-];
-
-@NgModule({
-  imports: [RouterModule.forRoot(routes, { useHash: true })],
-  exports: [RouterModule],
-})
-export class AppRoutingModule {}
--- a/console-webapp/src/app/app.component.html
+++ b/console-webapp/src/app/app.component.html
@@ -1,26 +0,0 @@
-<div class="console-app">
-  <app-header (toggleNavOpen)="sidenav.toggle()"></app-header>
-  <mat-sidenav-container class="console-app__container">
-    <mat-sidenav #sidenav class="console-app__sidebar">
-      <mat-nav-list>
-        <a mat-list-item [routerLink]="'/home'" routerLinkActive="active">
-          Home page
-        </a>
-        <a mat-list-item [routerLink]="'/tlds'" routerLinkActive="active">
-          TLDS
-        </a>
-        <a mat-list-item [routerLink]="'/settings'" routerLinkActive="active">
-          Settings
-        </a>
-      </mat-nav-list>
-    </mat-sidenav>
-    <mat-sidenav-content class="console-app__content-wrapper">
-      <div *ngIf="globalLoader.isLoading" class="console-app__global-spinner">
-        <mat-progress-bar mode="indeterminate"></mat-progress-bar>
-      </div>
-      <div class="console-app__content" *ngIf="renderRouter">
-        <router-outlet></router-outlet>
-      </div>
-    </mat-sidenav-content>
-  </mat-sidenav-container>
-</div>
--- a/console-webapp/src/app/app.component.scss
+++ b/console-webapp/src/app/app.component.scss
@@ -1,53 +0,0 @@
-// Copyright 2023 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.
-
-:host {
-  font-family: Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji",
-    "Segoe UI Emoji", "Segoe UI Symbol" !important;
-  font-size: 14px;
-  color: #333;
-  box-sizing: border-box;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.console-app {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  &__container {
-    flex: 1;
-    margin-top: -12px;
-    padding-bottom: 36px;
-  }
-  &__sidebar {
-    min-width: 300px;
-    a::before {
-      background-color: transparent;
-    }
-    .active {
-      background: #eae1e1;
-    }
-  }
-  &__content-wrapper {
-    margin: 12px 24px;
-  }
-  &__content {
-    max-width: 1340px;
-    margin: 0 auto;
-  }
-  &__global-spinner {
-    margin-bottom: 2rem;
-  }
-}
--- a/console-webapp/src/app/app.component.spec.ts
+++ b/console-webapp/src/app/app.component.spec.ts
@@ -1,34 +0,0 @@
-// Copyright 2022 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.
-
-import { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { AppComponent } from './app.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { MaterialModule } from './material.module';
-
-describe('AppComponent', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule, MaterialModule, BrowserAnimationsModule],
-      declarations: [AppComponent],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-});
--- a/console-webapp/src/app/app.component.ts
+++ b/console-webapp/src/app/app.component.ts
@@ -1,54 +0,0 @@
-// Copyright 2022 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.
-
-import { Component, ViewChild } from '@angular/core';
-import { RegistrarService } from './registrar/registrar.service';
-import { UserDataService } from './shared/services/userData.service';
-import { GlobalLoaderService } from './shared/services/globalLoader.service';
-import { NavigationEnd, Router } from '@angular/router';
-import { MatSidenav } from '@angular/material/sidenav';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss'],
-})
-export class AppComponent {
-  renderRouter: boolean = true;
-
-  @ViewChild('sidenav')
-  sidenav!: MatSidenav;
-
-  constructor(
-    protected registrarService: RegistrarService,
-    protected userDataService: UserDataService,
-    protected globalLoader: GlobalLoaderService,
-    protected router: Router
-  ) {
-    registrarService.activeRegistrarIdChange.subscribe(() => {
-      this.renderRouter = false;
-      setTimeout(() => {
-        this.renderRouter = true;
-      }, 400);
-    });
-  }
-
-  ngAfterViewInit() {
-    this.router.events.subscribe((event) => {
-      if (event instanceof NavigationEnd) {
-        this.sidenav.close();
-      }
-    });
-  }
-}
--- a/console-webapp/src/app/app.module.ts
+++ b/console-webapp/src/app/app.module.ts
@@ -1,97 +0,0 @@
-// Copyright 2023 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.
-
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule } from '@angular/forms';
-
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { MaterialModule } from './material.module';
-
-import { BackendService } from './shared/services/backend.service';
-
-import { HomeComponent } from './home/home.component';
-import { TldsComponent } from './tlds/tlds.component';
-import { HeaderComponent } from './header/header.component';
-import { SettingsComponent } from './settings/settings.component';
-import SettingsContactComponent, {
-  ContactDetailsDialogComponent,
-} from './settings/contact/contact.component';
-import { HttpClientModule } from '@angular/common/http';
-import { RegistrarComponent } from './registrar/registrarsTable.component';
-import { RegistrarGuard } from './registrar/registrar.guard';
-import SecurityComponent from './settings/security/security.component';
-import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
-import { EmptyRegistrar } from './registrar/emptyRegistrar.component';
-import { RegistrarSelectorComponent } from './registrar/registrar-selector.component';
-import { GlobalLoaderService } from './shared/services/globalLoader.service';
-import { ContactWidgetComponent } from './home/widgets/contact-widget.component';
-import { PromotionsWidgetComponent } from './home/widgets/promotions-widget.component';
-import { TldsWidgetComponent } from './home/widgets/tlds-widget.component';
-import { ResourcesWidgetComponent } from './home/widgets/resources-widget.component';
-import { EppWidgetComponent } from './home/widgets/epp-widget.component';
-import { BillingWidgetComponent } from './home/widgets/billing-widget.component';
-import { DomainsWidgetComponent } from './home/widgets/domains-widget.component';
-import { SettingsWidgetComponent } from './home/widgets/settings-widget.component';
-import { UserDataService } from './shared/services/userData.service';
-import WhoisComponent from './settings/whois/whois.component';
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    BillingWidgetComponent,
-    ContactDetailsDialogComponent,
-    ContactWidgetComponent,
-    DomainsWidgetComponent,
-    EmptyRegistrar,
-    EppWidgetComponent,
-    HeaderComponent,
-    HomeComponent,
-    PromotionsWidgetComponent,
-    RegistrarComponent,
-    RegistrarSelectorComponent,
-    ResourcesWidgetComponent,
-    SecurityComponent,
-    SettingsComponent,
-    SettingsContactComponent,
-    SettingsWidgetComponent,
-    TldsComponent,
-    TldsWidgetComponent,
-    WhoisComponent,
-  ],
-  imports: [
-    AppRoutingModule,
-    BrowserAnimationsModule,
-    BrowserModule,
-    FormsModule,
-    HttpClientModule,
-    MaterialModule,
-  ],
-  providers: [
-    BackendService,
-    GlobalLoaderService,
-    RegistrarGuard,
-    UserDataService,
-    {
-      provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
-      useValue: {
-        subscriptSizing: 'dynamic',
-      },
-    },
-  ],
-  bootstrap: [AppComponent],
-})
-export class AppModule {}
--- a/console-webapp/src/app/header/header.component.html
+++ b/console-webapp/src/app/header/header.component.html
@@ -1,24 +0,0 @@
-<p>
-  <mat-toolbar color="primary">
-    <button mat-icon-button aria-label="Open menu" (click)="toggleNavPane()">
-      <mat-icon>menu</mat-icon>
-    </button>
-    <span>
-      <a
-        [routerLink]="'/home'"
-        routerLinkActive="active"
-        class="console-app__logo"
-      >
-        Google Registry
-      </a>
-    </span>
-    <span class="spacer"></span>
-    <app-registrar-selector />
-    <button mat-icon-button aria-label="Open FAQ">
-      <mat-icon>question_mark</mat-icon>
-    </button>
-    <button mat-icon-button aria-label="Open user info">
-      <mat-icon>person</mat-icon>
-    </button>
-  </mat-toolbar>
-</p>
--- a/console-webapp/src/app/header/header.component.spec.ts
+++ b/console-webapp/src/app/header/header.component.spec.ts
@@ -1,39 +0,0 @@
-// Copyright 2023 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.
-
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HeaderComponent } from './header.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { MaterialModule } from '../material.module';
-
-describe('HeaderComponent', () => {
-  let component: HeaderComponent;
-  let fixture: ComponentFixture<HeaderComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [MaterialModule, BrowserAnimationsModule],
-      declarations: [HeaderComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(HeaderComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/console-webapp/src/app/home/home.component.html
+++ b/console-webapp/src/app/home/home.component.html
@@ -1,13 +0,0 @@
-<div class="console-app__home">
-  <h1>Welcome to the Google Registry Console</h1>
-  <div class="console-app__home-widgets">
-    <div app-domains-widget class="console-app__widget-wrapper__wide"></div>
-    <div app-contact-widget class="console-app__widget-wrapper__wide"></div>
-    <div app-tlds-widget></div>
-    <div app-promotions-widget class="console-app__widget-wrapper__wide"></div>
-    <div app-settings-widget class="console-app__widget-wrapper__wide"></div>
-    <div app-resources-widget></div>
-    <div app-billing-widget></div>
-    <div app-epp-widget></div>
-  </div>
-</div>
--- a/console-webapp/src/app/home/home.component.spec.ts
+++ b/console-webapp/src/app/home/home.component.spec.ts
@@ -1,38 +0,0 @@
-// Copyright 2022 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.
-
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HomeComponent } from './home.component';
-import { MaterialModule } from '../material.module';
-
-describe('HomeComponent', () => {
-  let component: HomeComponent;
-  let fixture: ComponentFixture<HomeComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [MaterialModule],
-      declarations: [HomeComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(HomeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/console-webapp/src/app/home/home.component.ts
+++ b/console-webapp/src/app/home/home.component.ts
@@ -1,23 +0,0 @@
-// Copyright 2022 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.
-
-import { Component, ViewEncapsulation } from '@angular/core';
-
-@Component({
-  selector: 'app-home',
-  templateUrl: './home.component.html',
-  styleUrls: ['./home.component.scss'],
-  encapsulation: ViewEncapsulation.None,
-})
-export class HomeComponent {}
--- a/console-webapp/src/app/home/widgets/billing-widget.component.html
+++ b/console-webapp/src/app/home/widgets/billing-widget.component.html
@@ -1,22 +0,0 @@
-<mat-card>
-  <mat-card-content>
-    <div class="console-app__widget">
-      <a
-        class="console-app__widget_left"
-        href="{{ driveFolderUrl }}"
-        (click)="openBillingDetails($event)"
-      >
-        <mat-icon class="console-app__widget-icon">account_balance</mat-icon>
-        <h1 class="console-app__widget-title">Billing Info</h1>
-        <h4 class="secondary-text text-center">
-          <span *ngIf="driveFolderUrl; else noDriveFolderUrl">
-            View important billing and payments information.
-          </span>
-          <ng-template #noDriveFolderUrl>
-            <span> Your billing folder is pending allocation. </span>
-          </ng-template>
-        </h4>
-      </a>
-    </div>
-  </mat-card-content>
-</mat-card>
--- a/console-webapp/src/app/home/widgets/billing-widget.component.ts
+++ b/console-webapp/src/app/home/widgets/billing-widget.component.ts
@@ -1,37 +0,0 @@
-// Copyright 2023 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.
-
-import { Component } from '@angular/core';
-import { RegistrarService } from 'src/app/registrar/registrar.service';
-
-@Component({
-  selector: '[app-billing-widget]',
-  templateUrl: './billing-widget.component.html',
-})
-export class BillingWidgetComponent {
-  constructor(public registrarService: RegistrarService) {}
-
-  public get driveFolderUrl(): string {
-    if (this.registrarService?.registrar.driveFolderId) {
-      return `https://drive.google.com/drive/folders/${this.registrarService?.registrar.driveFolderId}`;
-    }
-    return '';
-  }
-
-  openBillingDetails(e: MouseEvent) {
-    if (!this.driveFolderUrl) {
-      e.preventDefault();
-    }
-  }
-}
--- a/console-webapp/src/app/home/widgets/contact-widget.component.html
+++ b/console-webapp/src/app/home/widgets/contact-widget.component.html
@@ -1,27 +0,0 @@
-<mat-card>
-  <mat-card-content>
-    <div class="console-app__widget">
-      <div class="console-app__widget_left">
-        <mat-icon class="console-app__widget-icon">call</mat-icon>
-        <h1 class="console-app__widget-title">Contact Support</h1>
-        <h4 class="secondary-text text-center">
-          View Google Registry support email and phone information
-        </h4>
-      </div>
-      <div class="console-app__widget_right">
-        <button mat-button color="primary" class="console-app__widget-link">
-          Give us a Call
-        </button>
-        <p class="secondary-text">
-          Call Google Registry support at <b>+1 (404) 978 8419</b>
-        </p>
-        <button mat-button color="primary" class="console-app__widget-link">
-          Send us an Email
-        </button>
-        <p class="secondary-text">
-          Email Google Registry at <b>support@google.com</b>
-        </p>
-      </div>
-    </div>
-  </mat-card-content>
-</mat-card>
--- a/console-webapp/src/app/home/widgets/domains-widget.component.html
+++ b/console-webapp/src/app/home/widgets/domains-widget.component.html
@@ -1,25 +0,0 @@
-<mat-card>
-  <mat-card-content>
-    <div class="console-app__widget">
-      <div class="console-app__widget_left">
-        <mat-icon class="console-app__widget-icon">view_list</mat-icon>
-        <h1 class="console-app__widget-title">Domains</h1>
-        <h4 class="secondary-text text-center">
-          Manage domain names and registry lock settings.
-        </h4>
-      </div>
-      <div class="console-app__widget_right">
-        <button mat-button color="primary" class="console-app__widget-link">
-          Create a Domain
-        </button>
-        <p class="secondary-text">Register a new domain name</p>
-        <button mat-button color="primary" class="console-app__widget-link">
-          View DUMs
-        </button>
-        <p class="secondary-text">
-          Download a csv of all domains under management
-        </p>
-      </div>
-    </div>
-  </mat-card-content>
-</mat-card>
--- a/console-webapp/src/app/home/widgets/domains-widget.component.ts
+++ b/console-webapp/src/app/home/widgets/domains-widget.component.ts
@@ -1,23 +0,0 @@
-// Copyright 2023 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.
-
-import { Component } from '@angular/core';
-
-@Component({
-  selector: '[app-domains-widget]',
-  templateUrl: './domains-widget.component.html',
-})
-export class DomainsWidgetComponent {
-  constructor() {}
-}
--- a/Show More
+++ b/Show More