Fix console EPP password form, minor adjustments (#2445)

There are a bunch of cases where we want common exception handling and
it's annoying to have to deal with the common "set failed response and
make sure to return" a bunch of times.

This allows us to break up request methods more easily, since we can now
often throw exceptions that will break all the way back up to
ConsoleApiAction. Previously, any error handling had to exist in the
primary handler method so it could return.

appengine_war.gradle

@@ -47,10 +47,6 @@ war {
 
 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") {
@@ -103,10 +99,11 @@ explodeWar.doLast {
     file("${it.explodedAppDirectory}/WEB-INF/lib/tools.jar").setWritable(true)
 }
 
+appengineDeployAll.mustRunAfter ':console-webapp:deploy'
 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'

build.gradle

@@ -539,8 +539,6 @@ task coreDev {
   dependsOn 'javadoc'
   dependsOn 'checkDependenciesDotGradle'
   dependsOn 'checkLicense'
-  // TODO: @ptkach reenable after console design merged
-  // dependsOn ':console-webapp:runConsoleWebappUnitTests'
   dependsOn ':core:check'
   dependsOn 'assemble'
 }

common/gradle.lockfile

@@ -24,7 +24,7 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,deploy_jar,runtimeClasspat
 com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
 com.google.guava:guava:31.0.1-jre=checkstyle
 com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
-com.google.guava:guava:33.1.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
+com.google.guava:guava:33.2.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath
 com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor
 com.google.j2objc:j2objc-annotations:1.3=checkstyle
@@ -54,11 +54,11 @@ org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.11=jacocoAnt
 org.jacoco:org.jacoco.report:0.8.11=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.6=jacocoAnt
 org.ow2.asm:asm-tree:9.6=jacocoAnt

config/dependency-license/allowed_licenses.json

@@ -262,6 +262,9 @@
     {
       "moduleLicense": "Unicode/ICU License"
     },
+    {
+      "moduleLicense": "Unicode-3.0"
+    },
     {
       "moduleLicense": "Public Domain",
       "moduleName": "aopalliance:aopalliance"

config/presubmits.py

@@ -178,6 +178,18 @@ PRESUBMITS = {
         {"/node_modules/"},
     ):
         "Do not use shaded dependencies from testcontainers.",
+    PresubmitCheck(
+        r".*autovalue\.shaded.*",
+        "java",
+        {"/node_modules/"},
+    ):
+        "Do not use shaded dependencies from autovalue.",
+    PresubmitCheck(
+        r".*avro\.shaded.*",
+        "java",
+        {"/node_modules/"},
+    ):
+        "Do not use shaded dependencies from avro.",
     PresubmitCheck(
         r".*com\.google\.common\.truth\.Truth8.*",
         "java",

console-webapp/.gitignore

@@ -41,3 +41,6 @@ testem.log
 # System files
 .DS_Store
 Thumbs.db
+
+# Build artifact
+/staged/dist

console-webapp/build.gradle

@@ -11,12 +11,12 @@
 // 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"
+def projectParam = "--project=${rootProject.gcpProject}"
 
 clean {
   delete "${consoleDir}/node_modules"
-  delete "${consoleDir}/dist"
+  delete "${consoleDir}/staged/dist"
 }
 
 task npmInstallDeps(type: Exec) {
@@ -62,8 +62,14 @@ task checkFormatting(type: Exec) {
   args 'run', 'prettify:check'
 }
 
-tasks.runConsoleWebappUnitTests.dependsOn(tasks.npmInstallDeps)
+task deploy(type: Exec) {
+  workingDir "${consoleDir}/staged"
+  executable 'gcloud'
+  args 'app', 'deploy', "${projectParam}", '--quiet'
+}
+
 tasks.buildConsoleWebappProd.dependsOn(tasks.npmInstallDeps)
 tasks.applyFormatting.dependsOn(tasks.npmInstallDeps)
 tasks.checkFormatting.dependsOn(tasks.npmInstallDeps)
 tasks.build.dependsOn(tasks.checkFormatting)
+tasks.deploy.dependsOn(tasks.buildConsoleWebappProd)

console-webapp/package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config dev-proxy.config.json",
-    "build": "ng build --base-href=/console/",
+    "build": "ng build --base-href=/console/ --output-path=staged/dist",
     "build:local": "ng build --base-href=/default/console/",
     "watch": "ng build --watch --configuration development",
     "test": "ng test --browsers=ChromeHeadless --watch=false",

console-webapp/src/app/billingInfo/billingInfo.component.ts

@@ -14,6 +14,7 @@
 
 import { Component, computed } from '@angular/core';
 import { RegistrarService } from '../registrar/registrar.service';
+import { MatSnackBar } from '@angular/material/snack-bar';
 
 @Component({
   selector: 'app-billingInfo',
@@ -22,20 +23,25 @@ import { RegistrarService } from '../registrar/registrar.service';
 })
 export class BillingInfoComponent {
   public static PATH = 'billingInfo';
-  constructor(public registrarService: RegistrarService) {}
+  constructor(
+    public registrarService: RegistrarService,
+    private _snackBar: MatSnackBar
+  ) {}
 
   driveFolderUrl = computed<string>(() => {
     if (this.registrarService.registrar()?.driveFolderId) {
-      return `https://drive.google.com/drive/folders/${
+      return (
+        'https://drive.google.com/drive/folders/' +
         this.registrarService.registrar()?.driveFolderId
-      }`;
+      );
     }
     return '';
   });
 
   openBillingDetails(e: MouseEvent) {
-    if (!this.driveFolderUrl()) {
+    if (!this.registrarService.registrar()?.driveFolderId) {
       e.preventDefault();
+      this._snackBar.open('Billing Folder ID has not been assigned');
     }
   }
 }

console-webapp/src/app/home/home.component.html

@@ -10,7 +10,7 @@
           <mat-icon class="secondary-text">view_list</mat-icon>
           DUMs
         </h3>
-        <p class="secondary-text">View Domains</p>
+        <p class="secondary-text">View Domains Under Management</p>
       </mat-card-content>
       <mat-card-actions>
         <button mat-button color="primary" (click)="viewDums()">

console-webapp/src/app/navigation/navigation.component.html

@@ -7,7 +7,7 @@
     *matTreeNodeDef="let node"
     matTreeNodeToggle
     (click)="onClick(node)"
-    [class.active]="router.url.endsWith(node.path)"
+    [class.active]="router.url.includes(node.path)"
   >
     <mat-icon class="console-app__nav-icon" *ngIf="node.iconName">
       {{ node.iconName }}

console-webapp/src/app/registrar/registrarsTable.component.scss

@@ -26,7 +26,7 @@
     }
     &-driveId {
       min-width: 200px;
-      word-break: break-all;
+      word-break: break-word;
     }
     &-registryLockAllowed {
       max-width: 80px;

console-webapp/src/app/resources/resources.component.html

@@ -1,4 +1,4 @@
-<h1 class="mat-headline-4">Resource</h1>
+<h1 class="mat-headline-4">Resources</h1>
 <div class="console-app__resources">
   <div>
     <div class="console-app__resources-subhead">Technical resources</div>
@@ -6,7 +6,8 @@
       class="text-l"
       href="{{ userDataService.userData.technicalDocsUrl }}"
       target="_blank"
-      >View on Google Drive</a
+      >View onboarding FAQs, TLD information, and technical documentation on
+      Google Drive</a
     >
   </div>
   <div>

console-webapp/src/app/settings/contact/contact.component.ts

@@ -71,7 +71,7 @@ export default class ContactComponent {
     effect(() => {
       if (this.contactService.contacts()) {
         this.dataSource = new MatTableDataSource<ViewReadyContact>(
-          this.contactService.contacts().map(contactTypeToViewReadyContact)
+          this.contactService.contacts()
         );
       }
     });

console-webapp/src/app/settings/security/eppPasswordEdit.component.ts

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component } from '@angular/core';
 import {
   AbstractControl,
@@ -68,9 +69,12 @@ export default class EppPasswordEditComponent {
     ) {
       this.passwordUpdateForm?.get('newPasswordRepeat')?.setErrors(null);
     } else {
-      this.passwordUpdateForm
-        ?.get('newPasswordRepeat')
-        ?.setErrors({ passwordsDontMatch: control.value });
+      // latest angular just won't detect the error without setTimeout
+      setTimeout(() => {
+        this.passwordUpdateForm
+          ?.get('newPasswordRepeat')
+          ?.setErrors({ passwordsDontMatch: control.value });
+      });
     }
     return null;
   };
@@ -92,15 +96,24 @@ export default class EppPasswordEditComponent {
   });
 
   save() {
-    debugger;
-    // this.securityService.saveEppPassword().subscribe({
-    //   complete: () => {
-    //     this.goBack();
-    //   },
-    //   error: (err: HttpErrorResponse) => {
-    //     this._snackBar.open(err.error);
-    //   },
-    // });
+    const { oldPassword, newPassword, newPasswordRepeat } =
+      this.passwordUpdateForm.value;
+    if (!oldPassword || !newPassword || !newPasswordRepeat) return;
+    this.securityService
+      .saveEppPassword({
+        registrarId: this.registrarService.registrarId(),
+        oldPassword,
+        newPassword,
+        newPasswordRepeat,
+      })
+      .subscribe({
+        complete: () => {
+          this.goBack();
+        },
+        error: (err: HttpErrorResponse) => {
+          this._snackBar.open(err.error);
+        },
+      });
   }
 
   goBack() {

console-webapp/src/app/settings/security/security.component.html

@@ -24,7 +24,7 @@
         </mat-list-item>
         <mat-list-item role="listitem" lines="3">
           <span class="console-app__list-value"
-            >todo: come up with a text here</span
+            >Change the password used for EPP logins</span
           >
         </mat-list-item>
         <mat-list-item role="listitem">

console-webapp/src/app/settings/security/security.service.ts

@@ -22,6 +22,13 @@ import {
 } from 'src/app/registrar/registrar.service';
 import { BackendService } from 'src/app/shared/services/backend.service';
 
+export interface EppPasswordBackendModel {
+  registrarId: string;
+  oldPassword: string;
+  newPassword: string;
+  newPasswordRepeat: string;
+}
+
 export function apiToUiConverter(
   securitySettings: SecuritySettingsBackendModel = {}
 ): SecuritySettings {
@@ -68,5 +75,11 @@ export class SecurityService {
       );
   }
 
-  saveEppPassword() {}
+  saveEppPassword(data: EppPasswordBackendModel) {
+    return this.backend.postEppPasswordUpdate(data).pipe(
+      switchMap(() => {
+        return this.registrarService.loadRegistrars();
+      })
+    );
+  }
 }

console-webapp/src/app/settings/whois/whois.component.ts

@@ -37,7 +37,7 @@ export default class WhoisComponent {
       result += `${registrar?.localizedAddress?.state} `;
     }
     if (registrar?.localizedAddress?.countryCode) {
-      result += registrar?.localizedAddress?.countryCode;
+      result += `${registrar?.localizedAddress?.countryCode} `;
     }
     if (registrar?.localizedAddress?.zip) {
       result += registrar?.localizedAddress?.zip;

console-webapp/src/app/shared/services/backend.service.ts

@@ -23,6 +23,7 @@ import {
   WhoisRegistrarFields,
 } from '../../registrar/registrar.service';
 import { Contact } from '../../settings/contact/contact.service';
+import { EppPasswordBackendModel } from '../../settings/security/security.service';
 import { UserData } from './userData.service';
 
 @Injectable()
@@ -33,9 +34,9 @@ export class BackendService {
     error: HttpErrorResponse,
     mockData?: Type
   ): Observable<Type> {
-    // This is a temporary redirect to the old console untill the new console
+    // This is a temporary redirect to the old console until the new console
     // is fully released and enabled
-    if (error.url && window.location.href.indexOf(error.url) < 0) {
+    if (error.url && new URL(error.url).pathname === '/registrar') {
       window.location.href = error.url;
     }
     if (error.error instanceof Error) {
@@ -139,6 +140,15 @@ export class BackendService {
     );
   }
 
+  postEppPasswordUpdate(
+    data: EppPasswordBackendModel
+  ): Observable<EppPasswordBackendModel> {
+    return this.http.post<EppPasswordBackendModel>(
+      `/console-api/eppPassword`,
+      data
+    );
+  }
+
   getUserData(): Observable<UserData> {
     return this.http
       .get<UserData>('/console-api/userdata')

console-webapp/src/app/shared/services/globalLoader.service.ts

@@ -30,7 +30,7 @@ export interface GlobalLoader {
   providedIn: 'root',
 })
 export class GlobalLoaderService {
-  private static readonly TIMEOUT_MS = 3000;
+  private static readonly TIMEOUT_MS = 10000;
   private loaders = new Map<GlobalLoader, Subscription>();
   public isLoading: boolean = false;
 

console-webapp/src/styles.scss

@@ -63,7 +63,7 @@ body {
     .console-app__list-value {
       font-size: 14px;
       white-space: pre-line;
-      word-break: break-all;
+      word-break: break-word;
       color: var(--text);
     }
   }

console-webapp/staged/app.yaml

@@ -0,0 +1,4 @@
+runtime: nodejs20
+service: console
+build_env_variables:
+  GOOGLE_NODE_RUN_SCRIPTS: ''

console-webapp/staged/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "console-webapp-static-server",
+  "version": "0.0.0",
+  "scripts": {
+    "start": "node server.js",
+    "gcp-build":""
+  },
+  "private": true,
+  "dependencies": {
+    "express": "^4.16.4"
+  }
+}

console-webapp/staged/server.js

@@ -1,4 +1,4 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
+// Copyright 2024 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.
@@ -12,20 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package google.registry.request;
+const express = require('express');
 
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+const app = express();
+const PORT = process.env.PORT || 8080;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import javax.inject.Qualifier;
+app.use("/console", express.static('dist', {
+  etag: false,
+  lastModified: false,
+  maxAge: '1d',
+  setHeaders: setCustomCacheControl
+}));
 
-/**
- * Dagger qualifier for the AppEngine request_log_id.
- *
- * <p>This is the unique log identifier of the current request.
- */
-@Retention(RUNTIME)
-@Qualifier
-@Documented
-public @interface RequestLogId {}
+function setCustomCacheControl (res, path) {
+  // Custom Cache-Control for HTML files - we don't want to cache them
+  if (express.static.mime.lookup(path) === 'text/html') {
+    res.setHeader('Cache-Control', 'public, max-age=0');
+  }
+}
+
+app.listen(PORT);

core/gradle.lockfile

@@ -8,14 +8,22 @@ args4j:args4j:2.0.26=css
 args4j:args4j:2.33=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 cglib:cglib-nodep:2.2=css
 com.charleskorn.kaml:kaml:0.20.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-annotations:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-databind:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.datatype:jackson-datatype-joda:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.fasterxml.jackson:jackson-bom:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.17.0=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.17.0=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.17.0=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.17.0=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.0=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.0=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.17.0=testCompileClasspath,testRuntimeClasspath
 com.fasterxml:classmate:1.5.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
 com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -32,72 +40,76 @@ com.github.jnr:jnr-unixsocket:0.38.22=compileClasspath,deploy_jar,nonprodCompile
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:2.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:2.5.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:2.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:2.5.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.173.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.173.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:2.33.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.108.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.22=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-v1:6.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-common-protos:2.37.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.173.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.173.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.33.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigtable-v2:2.33.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.109.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-firestore-v1:3.16.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.api.grpc:gapic-google-cloud-storage-v2:2.38.0-alpha=testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.176.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:2.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.109.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.13.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.62.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.62.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.62.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.38.0-alpha=testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-common-protos:2.39.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.176.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.110.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.20.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0=compileClasspath,nonprodCompileClasspath,testCompileClasspath
-com.google.api.grpc:proto-google-cloud-monitoring-v3:3.36.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.108.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.12.22=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.41.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.41.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-v1:6.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2:2.41.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.131.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.131.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.37.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.32.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:api-common:2.29.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.46.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:2.46.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax:2.46.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-admin-directory:directory_v1-rev20240304-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-appengine:v1-rev20240226-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-bigquery:v2-rev20240124-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240128-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-dataflow:v1b3-rev20240113-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-monitoring-v3:3.39.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.109.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.43.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.43.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.62.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.62.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.62.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.62.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.api.grpc:proto-google-cloud-storage-v2:2.38.0-alpha=testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.43.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.133.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.133.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.39.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.34.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:api-common:2.31.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.48.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:2.48.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax:2.48.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-gmail:v1-rev20231218-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-gmail:v1-rev20240422-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-iam:v2-rev20240314-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-monitoring:v3-rev20240414-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-monitoring:v3-rev20240427-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-sheets:v4-rev20240402-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-sheets:v4-rev20240423-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20240324-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-storage:v1-rev20240205-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.26=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.26=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.26=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.26=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.26=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-storage:v1-rev20240311-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:2.0.27=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-stubs:2.0.27=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-remote-api:2.0.27=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:2.0.27=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-tools-sdk:2.0.27=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
@@ -111,27 +123,31 @@ com.google.closure-stylesheets:closure-stylesheets:1.5.0=css
 com.google.cloud.bigdataoss:gcsio:2.2.16=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.bigdataoss:util:2.2.16=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.bigtable:bigtable-client-core-config:1.28.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud.datastore:datastore-v1-proto-client:2.18.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud.datastore:datastore-v1-proto-client:2.19.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.sql:jdbc-socket-factory-core:1.18.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.sql:postgres-socket-factory:1.18.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigquerystorage:3.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigtable-stats:2.33.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigtable:2.33.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-grpc:2.32.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-http:2.31.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core:2.32.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-firestore:3.16.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigquerystorage:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigtable-stats:2.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigtable:2.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-grpc:2.36.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.cloud:google-cloud-core-grpc:2.38.0=testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-http:2.31.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.cloud:google-cloud-core-http:2.38.0=testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core:2.36.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.cloud:google-cloud-core:2.38.0=testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-firestore:3.20.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-monitoring:1.82.0=compileClasspath,nonprodCompileClasspath,testCompileClasspath
-com.google.cloud:google-cloud-monitoring:3.36.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-nio:0.127.15=testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-pubsub:1.126.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-pubsublite:1.12.22=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-secretmanager:2.41.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-spanner:6.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-tasks:2.41.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-monitoring:3.39.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-nio:0.127.17=testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-pubsub:1.127.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-pubsublite:1.13.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-secretmanager:2.43.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-spanner:6.62.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.cloud:google-cloud-storage:2.38.0=testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-tasks:2.43.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:grpc-gcp:1.5.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.20.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.1=css
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,nonprodAnnotationProcessor,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.10.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -159,19 +175,21 @@ com.google.googlejavaformat:google-java-format:1.5=annotationProcessor,testAnnot
 com.google.guava:failureaccess:1.0.1=checkstyle,errorprone,nonprodAnnotationProcessor,soy
 com.google.guava:failureaccess:1.0.2=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.guava:guava-parent:32.1.1-jre=errorprone,nonprodAnnotationProcessor
-com.google.guava:guava-testlib:33.1.0-jre=testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava-testlib:33.2.0-jre=testCompileClasspath,testRuntimeClasspath
 com.google.guava:guava:20.0=css
 com.google.guava:guava:31.0.1-jre=checkstyle,soy
 com.google.guava:guava:32.1.1-jre=errorprone,nonprodAnnotationProcessor
 com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:33.1.0-jre=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.1.0-jre=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.guava:guava:33.2.0-jre=testCompileClasspath,testRuntimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.gwt:gwt-user:2.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+com.google.http-client:google-http-client-apache-v2:1.44.1=testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-appengine:1.44.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-jackson2:1.43.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-protobuf:1.43.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-protobuf:1.44.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client:1.44.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.inject.extensions:guice-multibindings:4.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testCompileClasspath,testRuntimeClasspath
 com.google.inject:guice:4.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -187,16 +205,16 @@ com.google.jsinterop:jsinterop-annotations:2.0.0=compileClasspath,deploy_jar,non
 com.google.monitoring-client:contrib:1.0.7=testCompileClasspath,testRuntimeClasspath
 com.google.monitoring-client:metrics:1.0.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-appengine:1.35.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-java6:1.35.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-jetty:1.35.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-servlet:1.35.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client:1.35.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:3.25.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-appengine:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-java6:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-jetty:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-servlet:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:2.5.0=css
 com.google.protobuf:protobuf-java:3.13.0=soy
 com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.template:soy:2021-02-01=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testCompileClasspath,testRuntimeClasspath
 com.google.truth:truth:1.4.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -233,11 +251,11 @@ com.sun.xml.bind:jaxb-impl:2.3.9=jaxb
 com.sun.xml.bind:jaxb-osgi:4.0.5=jaxb
 com.sun.xml.bind:jaxb-xjc:2.3.9=jaxb
 com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.paranamer:paranamer:2.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.zaxxer:HikariCP:5.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-beanutils:commons-beanutils:1.9.4=checkstyle
 commons-codec:commons-codec:1.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-collections:commons-collections:3.2.2=checkstyle
+commons-io:commons-io:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 dnsjava:dnsjava:3.5.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0=testRuntimeClasspath
@@ -255,24 +273,21 @@ io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,deploy_jar,er
 io.grpc:grpc-alts:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-api:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-auth:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-census:1.61.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-census:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-context:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-core:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-googleapis:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-grpclb:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-inprocess:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-netty:1.61.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-netty:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-protobuf-lite:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-protobuf:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-rls:1.61.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-services:1.61.0=compileClasspath,nonprodCompileClasspath,testCompileClasspath
-io.grpc:grpc-services:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-rls:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-services:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-stub:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-util:1.61.0=compileClasspath,nonprodCompileClasspath,testCompileClasspath
-io.grpc:grpc-util:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-xds:1.61.0=compileClasspath,nonprodCompileClasspath,testCompileClasspath
-io.grpc:grpc-xds:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-util:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-xds:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-buffer:4.1.100.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-http2:4.1.100.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-http:4.1.100.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -325,41 +340,41 @@ javax.xml.bind:jaxb-api:2.4.0-b180830.0359=jaxb
 joda-time:joda-time:2.10.14=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=nonprodCompileClasspath,nonprodRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.arnx:nashorn-promise:0.1.1=testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.12=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.12.18=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
-net.bytebuddy:byte-buddy:1.14.12=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.15=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.12=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
+net.bytebuddy:byte-buddy:1.14.15=testCompileClasspath,testRuntimeClasspath
 net.java.dev.javacc:javacc:4.1=css
 net.java.dev.jna:jna:5.13.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor
 net.sf.saxon:Saxon-HE:10.6=checkstyle
 org.antlr:antlr4-runtime:4.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.9.3=checkstyle
-org.apache.arrow:arrow-format:15.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.arrow:arrow-memory-core:15.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.arrow:arrow-vector:15.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.avro:avro:1.8.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-fn-execution:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-job-management:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-pipeline:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-format:15.0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-memory-core:15.0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-vector:15.0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.avro:avro:1.11.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-fn-execution:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-job-management:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-pipeline:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.beam:beam-runners-core-construction-java:2.54.0=testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-core-java:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-direct-java:2.55.1=testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-java-fn-execution:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-core:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-expansion-service:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-arrow:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-avro:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-core-java:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-direct-java:2.56.0=testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-java-fn-execution:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-core:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-expansion-service:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-arrow:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-avro:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.beam:beam-sdks-java-fn-execution:2.54.0=testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-harness:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-transform-service-launcher:2.55.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-harness:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-transform-service-launcher:2.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-compress:1.24.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.commons:commons-csv:1.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.commons:commons-csv:1.11.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-exec:1.3=testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.14.0=testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.9=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath
@@ -373,12 +388,12 @@ org.apache.sshd:sshd-common:2.12.1=testCompileClasspath,testRuntimeClasspath
 org.apache.sshd:sshd-core:2.12.1=testCompileClasspath,testRuntimeClasspath
 org.apache.sshd:sshd-scp:2.12.1=testCompileClasspath,testRuntimeClasspath
 org.apache.sshd:sshd-sftp:2.12.1=testCompileClasspath,testRuntimeClasspath
-org.apache.tomcat:tomcat-annotations-api:11.0.0-M19=testCompileClasspath,testRuntimeClasspath
+org.apache.tomcat:tomcat-annotations-api:11.0.0-M20=testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.bouncycastle:bcpg-jdk18on:1.78=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcpkix-jdk18on:1.78=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcprov-jdk18on:1.78=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcutil-jdk18on:1.78=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpg-jdk18on:1.78.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpkix-jdk18on:1.78.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,nonprodCompileClasspath,testCompileClasspath
 org.checkerframework:checker-compat-qual:2.5.5=annotationProcessor,testAnnotationProcessor
 org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
@@ -386,24 +401,23 @@ org.checkerframework:checker-qual:3.12.0=checkstyle,soy
 org.checkerframework:checker-qual:3.33.0=errorprone,nonprodAnnotationProcessor
 org.checkerframework:checker-qual:3.41.0=annotationProcessor,testAnnotationProcessor
 org.checkerframework:checker-qual:3.42.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.easymock:easymock:3.0=css
 org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-xml:12.0.8=testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-core:10.11.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-database-postgresql:10.11.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-ee:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-xml:12.0.9=testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-core:10.13.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.gwtproject:gwt-user:2.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -442,27 +456,27 @@ org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=deploy_jar,nonprodRun
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor
 org.jetbrains:annotations:17.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jline:jline:3.25.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jline:jline:3.26.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.joda:joda-money:1.0.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.json:json:20160212=soy
-org.json:json:20231013=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.json:json:20240303=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jsoup:jsoup:1.17.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit-pioneer:junit-pioneer:2.2.0=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-migrationsupport:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.10.2=testRuntimeClasspath
-org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-migrationsupport:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-runner:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-api:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-commons:1.11.0-M1=testRuntimeClasspath
+org.junit:junit-bom:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
 org.jvnet.staxex:stax-ex:1.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.mockito:mockito-core:1.10.19=css
-org.mockito:mockito-core:5.11.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-junit-jupiter:5.11.0=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:5.12.0=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-junit-jupiter:5.12.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:2.1=css
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.ogce:xpp3:1.1.6=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -499,14 +513,13 @@ org.slf4j:slf4j-api:2.0.13=compileClasspath,nonprodCompileClasspath,nonprodRunti
 org.slf4j:slf4j-api:2.1.0-alpha1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-jdk14:2.1.0-alpha1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-org.testcontainers:database-commons:1.19.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.testcontainers:jdbc:1.19.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.testcontainers:junit-jupiter:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:postgresql:1.19.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.testcontainers:selenium:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:testcontainers:1.19.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.threeten:threetenbp:1.6.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.tukaani:xz:1.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:database-commons:1.19.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:jdbc:1.19.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:postgresql:1.19.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:selenium:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:testcontainers:1.19.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.threeten:threetenbp:1.6.9=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.w3c.css:sac:1.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.webjars.npm:viz.js-graphviz-java:2.1.3=testRuntimeClasspath
 org.xerial.snappy:snappy-java:1.1.10.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

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

@@ -17,4 +17,12 @@
     <url>*/check</url>
     <module>pubapi</module>
   </dispatch>
+  <dispatch>
+    <url>*/console/*</url>
+    <module>console</module>
+  </dispatch>
+  <dispatch>
+    <url>*/console</url>
+    <module>console</module>
+  </dispatch>
 </dispatch-entries>

core/src/main/java/google/registry/model/console/User.java

@@ -14,7 +14,6 @@
 
 package google.registry.model.console;
 
-
 import google.registry.persistence.VKey;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
@@ -58,6 +57,5 @@ public class User extends UserBase {
     public Builder(User user) {
       super(user);
     }
-
   }
 }

core/src/main/java/google/registry/model/console/UserBase.java

@@ -25,6 +25,8 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 import google.registry.model.Buildable;
 import google.registry.model.UpdateAutoTimestampEntity;
 import google.registry.util.PasswordUtils;
+import java.util.Optional;
+import javax.annotation.Nullable;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.Column;
@@ -54,6 +56,9 @@ public class UserBase extends UpdateAutoTimestampEntity implements Buildable {
   @Column(nullable = false)
   String emailAddress;
 
+  /** Optional external email address to use for registry lock confirmation emails. */
+  @Column String registryLockEmailAddress;
+
   /** Roles (which grant permissions) associated with this user. */
   @Column(nullable = false)
   UserRoles userRoles;
@@ -89,6 +94,10 @@ public class UserBase extends UpdateAutoTimestampEntity implements Buildable {
     return emailAddress;
   }
 
+  public Optional<String> getRegistryLockEmailAddress() {
+    return Optional.ofNullable(registryLockEmailAddress);
+  }
+
   public UserRoles getUserRoles() {
     return userRoles;
   }
@@ -150,6 +159,12 @@ public class UserBase extends UpdateAutoTimestampEntity implements Buildable {
       return thisCastToDerived();
     }
 
+    public B setRegistryLockEmailAddress(@Nullable String registryLockEmailAddress) {
+      getInstance().registryLockEmailAddress =
+          registryLockEmailAddress == null ? null : checkValidEmail(registryLockEmailAddress);
+      return thisCastToDerived();
+    }
+
     public B setUserRoles(UserRoles userRoles) {
       checkArgumentNotNull(userRoles, "User roles cannot be null");
       getInstance().userRoles = userRoles;

core/src/main/java/google/registry/model/tld/Tld.java

@@ -458,20 +458,6 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl
   @JsonDeserialize(using = CurrencyDeserializer.class)
   CurrencyUnit currency = DEFAULT_CURRENCY;
 
-  // TODO(sarahbot@): Remove this field once all saved configuration files have this field removed
-  /** The per-year billing cost for registering a new domain name. */
-  @Deprecated
-  @JsonIgnore
-  @Type(type = JodaMoneyType.TYPE_NAME)
-  @Columns(
-      columns = {
-        @Column(name = "create_billing_cost_amount"),
-        @Column(name = "create_billing_cost_currency")
-      })
-  Money createBillingCost = DEFAULT_CREATE_BILLING_COST;
-
-  // TODO(sarahbot@): Rename this field to createBillingCost once the old createBillingCost has been
-  // removed
   /** A property that transitions to different create billing costs at different times. */
   @Column(nullable = false)
   @JsonDeserialize(using = TimedTransitionPropertyMoneyDeserializer.class)
@@ -682,19 +668,10 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl
    * Use {@code PricingEngineProxy.getDomainCreateCost} instead of this to find the cost for a
    * domain create.
    */
-  @VisibleForTesting
   public Money getCreateBillingCost(DateTime now) {
     return createBillingCostTransitions.getValueAtTime(now);
   }
 
-  // This getter is still necessary for the Jackson deserialization in the ConfigureTldCommand
-  // TODO(sarahbot@): Remove this getter once the deprecated createBillingCost field is removed from
-  // the schema
-  @Deprecated
-  public Money getCreateBillingCost() {
-    return createBillingCost;
-  }
-
   public ImmutableSortedMap<DateTime, Money> getCreateBillingCostTransitions() {
     return createBillingCostTransitions.toValueMap();
   }
@@ -976,12 +953,6 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl
       return this;
     }
 
-    public Builder setCreateBillingCost(Money amount) {
-      checkArgument(amount.isPositiveOrZero(), "createBillingCost cannot be negative");
-      getInstance().createBillingCost = amount;
-      return this;
-    }
-
     public Builder setCreateBillingCostTransitions(
         ImmutableSortedMap<DateTime, Money> createCostsMap) {
       checkArgumentNotNull(createCostsMap, "Create billing costs map cannot be null");

core/src/main/java/google/registry/module/RegistryComponent.java

@@ -23,6 +23,7 @@ import google.registry.batch.BatchModule;
 import google.registry.bigquery.BigqueryModule;
 import google.registry.config.CloudTasksUtilsModule;
 import google.registry.config.CredentialModule;
+import google.registry.config.RegistryConfig.Config;
 import google.registry.config.RegistryConfig.ConfigModule;
 import google.registry.dns.writer.VoidDnsWriterModule;
 import google.registry.export.DriveModule;
@@ -96,6 +97,9 @@ interface RegistryComponent {
 
   Lazy<MetricReporter> metricReporter();
 
+  @Config("projectId")
+  String projectId();
+
   @Module
   class RegistryModule {
     @Provides

core/src/main/java/google/registry/module/RegistryServlet.java

@@ -14,17 +14,68 @@
 
 package google.registry.module;
 
+import static google.registry.util.GcpJsonFormatter.setCurrentTraceId;
+import static google.registry.util.RandomStringGenerator.insecureRandomStringGenerator;
+import static google.registry.util.StringGenerator.Alphabets.HEX_DIGITS_ONLY;
+
 import com.google.monitoring.metrics.MetricReporter;
 import dagger.Lazy;
 import google.registry.request.RequestHandler;
+import google.registry.util.GcpJsonFormatter;
+import google.registry.util.JdkLoggerConfig;
+import google.registry.util.RandomStringGenerator;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
 
 /** Servlet that handles all requests. */
 public class RegistryServlet extends ServletBase {
+
+  // Length of a log trace_id, arbitrarily chosen.
+  private static final int LOG_TRACE_ID_LENGTH = 32;
+  // GCP log trace pattern. Fill in project_id and trace id
+  private static final String LOG_TRACE_PATTERN = "projects/%s/traces/%s";
+  private static final RandomStringGenerator LOG_TRACE_ID_GENERATOR =
+      insecureRandomStringGenerator(HEX_DIGITS_ONLY);
+
   private static final RegistryComponent component = DaggerRegistryComponent.create();
   private static final RequestHandler<RequestComponent> requestHandler = component.requestHandler();
   private static final Lazy<MetricReporter> metricReporter = component.metricReporter();
 
+  private final String projectId;
+
+  static {
+    // Remove all other handlers on the root logger to avoid double logging.
+    JdkLoggerConfig rootLoggerConfig = JdkLoggerConfig.getConfig("");
+    Arrays.asList(rootLoggerConfig.getHandlers()).forEach(rootLoggerConfig::removeHandler);
+
+    Handler rootHandler = new ConsoleHandler();
+    rootHandler.setLevel(Level.INFO);
+    rootHandler.setFormatter(new GcpJsonFormatter());
+    rootLoggerConfig.addHandler(rootHandler);
+  }
+
   public RegistryServlet() {
     super(requestHandler, metricReporter);
+    this.projectId = component.projectId();
+  }
+
+  @Override
+  public void service(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
+    setCurrentTraceId(traceId());
+    try {
+      super.service(req, rsp);
+    } finally {
+      setCurrentTraceId(null);
+    }
+  }
+
+  String traceId() {
+    return String.format(
+        LOG_TRACE_PATTERN, projectId, LOG_TRACE_ID_GENERATOR.createString(LOG_TRACE_ID_LENGTH));
   }
 }

core/src/main/java/google/registry/persistence/transaction/DatabaseException.java

@@ -14,9 +14,9 @@
 
 package google.registry.persistence.transaction;
 
-import autovalue.shaded.com.google.common.collect.ImmutableList;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
 import java.sql.SQLException;
 import java.util.Optional;
 import javax.persistence.PersistenceException;

core/src/main/java/google/registry/privileges/secretmanager/SqlCredential.java

@@ -14,7 +14,7 @@
 
 package google.registry.privileges.secretmanager;
 
-import static avro.shaded.com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Preconditions.checkState;
 
 import java.util.List;
 

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

@@ -14,7 +14,7 @@
 
 package google.registry.rdap;
 
-import com.google.auto.value.AutoValue;
+import com.google.auto.value.AutoBuilder;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.monitoring.metrics.DistributionFitter;
@@ -102,10 +102,7 @@ public class RdapMetrics {
   static final IncrementableMetric requests =
       MetricRegistryImpl.getDefault()
           .newIncrementableMetric(
-              "/rdap/requests",
-              "Count of RDAP Requests",
-              "count",
-              LABEL_DESCRIPTORS_FOR_REQUESTS);
+              "/rdap/requests", "Count of RDAP Requests", "count", LABEL_DESCRIPTORS_FOR_REQUESTS);
 
   @VisibleForTesting
   static final IncrementableMetric responses =
@@ -163,8 +160,7 @@ public class RdapMetrics {
    * ways of looking at the data, since cardinality constraints prevent us from saving all the
    * information in a single metric.
    */
-  public void updateMetrics(
-      RdapMetricInformation rdapMetricInformation) {
+  public void updateMetrics(RdapMetricInformation rdapMetricInformation) {
     requests.increment(
         rdapMetricInformation.endpointType().toString(),
         rdapMetricInformation.includeDeleted() ? "YES" : "NO",
@@ -206,95 +202,76 @@ public class RdapMetrics {
     }
   }
 
-  @AutoValue
-  abstract static class RdapMetricInformation {
+  /**
+   * Information on RDAP metrics.
+   *
+   * @param endpointType The type of RDAP endpoint (domain, domains, nameserver, etc.).
+   * @param searchType The search type (by domain name, by nameserver name, etc.).
+   * @param wildcardType The type of wildcarding requested (prefix, suffix, etc.).
+   * @param prefixLength The length of the prefix string before the wildcard, if any; any length
+   *     longer than MAX_RECORDED_PREFIX_LENGTH is limited to MAX_RECORDED_PREFIX_LENGTH when
+   *     recording the metric, to avoid cardinality problems.
+   * @param includeDeleted Whether the search included deleted records.
+   * @param registrarSpecified Whether the search requested a specific registrar.
+   * @param role Type of authentication/authorization: public, admin or registrar.
+   * @param requestMethod Http request method (GET, POST, HEAD, etc.).
+   * @param statusCode Http status code.
+   * @param incompletenessWarningType Incompleteness warning type (e.g. truncated).
+   * @param numDomainsRetrieved Number of domains retrieved from the database; this might be more
+   *     than were actually returned in the response; absent if a search was not performed.
+   * @param numHostsRetrieved Number of hosts retrieved from the database; this might be more than
+   *     were actually returned in the response; absent if a search was not performed.
+   * @param numContactsRetrieved Number of contacts retrieved from the database; this might be more
+   *     than were actually returned in the response; absent if a search was not performed.
+   */
+  record RdapMetricInformation(
+      EndpointType endpointType,
+      SearchType searchType,
+      WildcardType wildcardType,
+      int prefixLength,
+      boolean includeDeleted,
+      boolean registrarSpecified,
+      RdapAuthorization.Role role,
+      Action.Method requestMethod,
+      int statusCode,
+      IncompletenessWarningType incompletenessWarningType,
+      Optional<Long> numDomainsRetrieved,
+      Optional<Long> numHostsRetrieved,
+      Optional<Long> numContactsRetrieved) {
 
-    /** The type of RDAP endpoint (domain, domains, nameserver, etc.). */
-    abstract EndpointType endpointType();
+    @AutoBuilder
+    interface Builder {
+      Builder setEndpointType(EndpointType endpointType);
 
-    /** The search type (by domain name, by nameserver name, etc.). */
-    abstract SearchType searchType();
+      Builder setSearchType(SearchType searchType);
 
-    /** The type of wildcarding requested (prefix, suffix, etc.). */
-    abstract WildcardType wildcardType();
+      Builder setWildcardType(WildcardType wildcardType);
 
-    /**
-     * The length of the prefix string before the wildcard, if any; any length longer than
-     * MAX_RECORDED_PREFIX_LENGTH is limited to MAX_RECORDED_PREFIX_LENGTH when recording the
-     * metric, to avoid cardinality problems.
-     */
-    abstract int prefixLength();
+      Builder setPrefixLength(int prefixLength);
 
-    /** Whether the search included deleted records. */
-    abstract boolean includeDeleted();
+      Builder setIncludeDeleted(boolean includeDeleted);
 
-    /** Whether the search requested a specific registrar. */
-    abstract boolean registrarSpecified();
+      Builder setRegistrarSpecified(boolean registrarSpecified);
 
-    /** Type of authentication/authorization: public, admin or registrar. */
-    abstract RdapAuthorization.Role role();
+      Builder setRole(RdapAuthorization.Role role);
 
-    /** Http request method (GET, POST, HEAD, etc.). */
-    abstract Action.Method requestMethod();
+      Builder setRequestMethod(Action.Method requestMethod);
 
-    /** Http status code. */
-    abstract int statusCode();
+      Builder setStatusCode(int statusCode);
 
-    /** Incompleteness warning type (e.g. truncated). */
-    abstract IncompletenessWarningType incompletenessWarningType();
+      Builder setIncompletenessWarningType(IncompletenessWarningType incompletenessWarningType);
 
-    /**
-     * Number of domains retrieved from the database; this might be more than were actually returned
-     * in the response; absent if a search was not performed.
-     */
-    abstract Optional<Long> numDomainsRetrieved();
+      Builder setNumDomainsRetrieved(long numDomainsRetrieved);
 
-    /**
-     * Number of hosts retrieved from the database; this might be more than were actually returned
-     * in the response; absent if a search was not performed.
-     */
-    abstract Optional<Long> numHostsRetrieved();
+      Builder setNumHostsRetrieved(long numHostsRetrieved);
 
-    /**
-     * Number of contacts retrieved from the database; this might be more than were actually
-     * returned in the response; absent if a search was not performed.
-     */
-    abstract Optional<Long> numContactsRetrieved();
+      Builder setNumContactsRetrieved(long numContactRetrieved);
 
-    @AutoValue.Builder
-    abstract static class Builder {
-      abstract Builder setEndpointType(EndpointType endpointType);
-
-      abstract Builder setSearchType(SearchType searchType);
-
-      abstract Builder setWildcardType(WildcardType wildcardType);
-
-      abstract Builder setPrefixLength(int prefixLength);
-
-      abstract Builder setIncludeDeleted(boolean includeDeleted);
-
-      abstract Builder setRegistrarSpecified(boolean registrarSpecified);
-
-      abstract Builder setRole(RdapAuthorization.Role role);
-
-      abstract Builder setRequestMethod(Action.Method requestMethod);
-
-      abstract Builder setStatusCode(int statusCode);
-
-      abstract Builder setIncompletenessWarningType(
-          IncompletenessWarningType incompletenessWarningType);
-
-      abstract Builder setNumDomainsRetrieved(long numDomainsRetrieved);
-
-      abstract Builder setNumHostsRetrieved(long numHostsRetrieved);
-
-      abstract Builder setNumContactsRetrieved(long numContactRetrieved);
-
-      abstract RdapMetricInformation build();
+      RdapMetricInformation build();
     }
 
     static Builder builder() {
-      return new AutoValue_RdapMetrics_RdapMetricInformation.Builder()
+      return new AutoBuilder_RdapMetrics_RdapMetricInformation_Builder()
           .setSearchType(SearchType.NONE)
           .setWildcardType(WildcardType.INVALID)
           .setPrefixLength(0)

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

@@ -14,14 +14,23 @@
 
 package google.registry.rdap;
 
-import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import google.registry.model.EppResource;
 import google.registry.rdap.RdapSearchResults.IncompletenessWarningType;
 import java.util.List;
 
-@AutoValue
-abstract class RdapResultSet<T extends EppResource> {
+/**
+ * RDAP result set.
+ *
+ * @param resources List of EPP resources.
+ * @param incompletenessWarningType Type of warning to display regarding possible incomplete data.
+ * @param numResourcesRetrieved Number of resources retrieved from the database in the process of
+ *     assembling the data set.
+ */
+record RdapResultSet<T extends EppResource>(
+    ImmutableList<T> resources,
+    IncompletenessWarningType incompletenessWarningType,
+    int numResourcesRetrieved) {
 
   static <S extends EppResource> RdapResultSet<S> create(List<S> resources) {
     return create(resources, IncompletenessWarningType.COMPLETE, resources.size());
@@ -31,16 +40,7 @@ abstract class RdapResultSet<T extends EppResource> {
       List<S> resources,
       IncompletenessWarningType incompletenessWarningType,
       int numResourcesRetrieved) {
-    return new AutoValue_RdapResultSet<>(
+    return new RdapResultSet<>(
         ImmutableList.copyOf(resources), incompletenessWarningType, numResourcesRetrieved);
   }
-
-  /** List of EPP resources. */
-  abstract ImmutableList<T> resources();
-
-  /** Type of warning to display regarding possible incomplete data. */
-  abstract IncompletenessWarningType incompletenessWarningType();
-
-  /** Number of resources retrieved from the database in the process of assembling the data set. */
-  abstract int numResourcesRetrieved();
 }

core/src/main/java/google/registry/rde/PendingDeposit.java

@@ -14,16 +14,13 @@
 
 package google.registry.rde;
 
-import static com.google.common.base.Preconditions.checkState;
 
 import google.registry.model.common.Cursor.CursorType;
 import google.registry.model.rde.RdeMode;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamException;
 import java.io.OutputStream;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -49,10 +46,12 @@ import org.joda.time.Duration;
  * @param manual True if deposits should be generated via manual operation, which does not update
  *     the cursor, and saves the generated deposits in a special manual subdirectory tree.
  * @param tld TLD for which a deposit should be generated.
- * @param watermark Watermark date for which a deposit should be generated.
+ * @param watermarkStr String representation of the watermark date for which a deposit should be
+ *     generated.
  * @param mode Which type of deposit to generate: full (RDE) or thin (BRDA).
  * @param cursor The cursor type to update (not used in manual operation).
- * @param interval Amount of time to increment the cursor (not used in manual operation).
+ * @param intervalStr String representation of the amount of time to increment the cursor (not used
+ *     in manual operation).
  * @param directoryWithTrailingSlash Subdirectory of bucket/manual in which files should be placed,
  *     including a trailing slash (used only in manual operation).
  * @param revision Revision number for generated files; if absent, use the next available in the
@@ -61,19 +60,28 @@ import org.joda.time.Duration;
 public record PendingDeposit(
     boolean manual,
     String tld,
-    DateTime watermark,
+    String watermarkStr,
     RdeMode mode,
-    CursorType cursor,
-    Duration interval,
-    String directoryWithTrailingSlash,
+    @Nullable CursorType cursor,
+    @Nullable String intervalStr,
+    @Nullable String directoryWithTrailingSlash,
     @Nullable Integer revision)
     implements Serializable {
 
-  private static final long serialVersionUID = 3141095605225904433L;
+  public DateTime watermark() {
+    return DateTime.parse(watermarkStr);
+  }
+
+  public Duration interval() {
+    return intervalStr == null ? null : Duration.parse(intervalStr);
+  }
+
+  @Serial private static final long serialVersionUID = 3141095605225904433L;
 
   public static PendingDeposit create(
       String tld, DateTime watermark, RdeMode mode, CursorType cursor, Duration interval) {
-    return new PendingDeposit(false, tld, watermark, mode, cursor, interval, null, null);
+    return new PendingDeposit(
+        false, tld, watermark.toString(), mode, cursor, interval.toString(), null, null);
   }
 
   public static PendingDeposit createInManualOperation(
@@ -83,55 +91,7 @@ public record PendingDeposit(
       String directoryWithTrailingSlash,
       @Nullable Integer revision) {
     return new PendingDeposit(
-        true, tld, watermark, mode, null, null, directoryWithTrailingSlash, revision);
-  }
-
-  /**
-   * Specifies that {@link SerializedForm} be used for {@code SafeObjectInputStream}-compatible
-   * custom-serialization of {@link PendingDeposit the AutoValue implementation class}.
-   *
-   * <p>This method is package-protected so that the AutoValue implementation class inherits this
-   * behavior.
-   *
-   * <p>This method leverages {@link PendingDepositCoder} to serializes an instance. However, it is
-   * not invoked in Beam pipelines.
-   */
-  Object writeReplace() throws ObjectStreamException {
-    return new SerializedForm(this);
-  }
-
-  /**
-   * Proxy for custom-serialization of {@link PendingDeposit}. This is necessary because the actual
-   * class to be (de)serialized is the generated AutoValue implementation. See also {@link
-   * #writeReplace}.
-   *
-   * <p>This class leverages {@link PendingDepositCoder} to safely deserializes an instance.
-   * However, it is not used in Beam pipelines.
-   */
-  private static class SerializedForm implements Serializable {
-
-    private static final long serialVersionUID = 3141095605225904433L;
-
-    private PendingDeposit value;
-
-    private SerializedForm(PendingDeposit value) {
-      this.value = value;
-    }
-
-    private void writeObject(ObjectOutputStream os) throws IOException {
-      checkState(value != null, "Non-null value expected for serialization.");
-      PendingDepositCoder.INSTANCE.encode(value, os);
-    }
-
-    private void readObject(ObjectInputStream is) throws IOException, ClassNotFoundException {
-      checkState(value == null, "Non-null value unexpected for deserialization.");
-      this.value = PendingDepositCoder.INSTANCE.decode(is);
-    }
-
-    @SuppressWarnings("unused")
-    private Object readResolve() throws ObjectStreamException {
-      return this.value;
-    }
+        true, tld, watermark.toString(), mode, null, null, directoryWithTrailingSlash, revision);
   }
 
   /**
@@ -158,15 +118,12 @@ public record PendingDeposit(
     public void encode(PendingDeposit value, OutputStream outStream) throws IOException {
       BooleanCoder.of().encode(value.manual(), outStream);
       StringUtf8Coder.of().encode(value.tld(), outStream);
-      StringUtf8Coder.of().encode(value.watermark().toString(), outStream);
+      StringUtf8Coder.of().encode(value.watermarkStr(), outStream);
       StringUtf8Coder.of().encode(value.mode().name(), outStream);
       NullableCoder.of(StringUtf8Coder.of())
           .encode(
               Optional.ofNullable(value.cursor()).map(CursorType::name).orElse(null), outStream);
-      NullableCoder.of(StringUtf8Coder.of())
-          .encode(
-              Optional.ofNullable(value.interval()).map(Duration::toString).orElse(null),
-              outStream);
+      NullableCoder.of(StringUtf8Coder.of()).encode(value.intervalStr(), outStream);
       NullableCoder.of(StringUtf8Coder.of()).encode(value.directoryWithTrailingSlash(), outStream);
       NullableCoder.of(VarIntCoder.of()).encode(value.revision(), outStream);
     }
@@ -176,14 +133,12 @@ public record PendingDeposit(
       return new PendingDeposit(
           BooleanCoder.of().decode(inStream),
           StringUtf8Coder.of().decode(inStream),
-          DateTime.parse(StringUtf8Coder.of().decode(inStream)),
+          StringUtf8Coder.of().decode(inStream),
           RdeMode.valueOf(StringUtf8Coder.of().decode(inStream)),
           Optional.ofNullable(NullableCoder.of(StringUtf8Coder.of()).decode(inStream))
               .map(CursorType::valueOf)
               .orElse(null),
-          Optional.ofNullable(NullableCoder.of(StringUtf8Coder.of()).decode(inStream))
-              .map(Duration::parse)
-              .orElse(null),
+          NullableCoder.of(StringUtf8Coder.of()).decode(inStream),
           NullableCoder.of(StringUtf8Coder.of()).decode(inStream),
           NullableCoder.of(VarIntCoder.of()).decode(inStream));
     }

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

@@ -34,6 +34,14 @@ public abstract class CreateOrUpdateUserCommand extends ConfirmingCommand {
   @Parameter(names = "--email", description = "Email address of the user", required = true)
   String email;
 
+  @Nullable
+  @Parameter(
+      names = "--registry_lock_email_address",
+      description =
+          "Optional external email address to use for registry lock confirmation emails, or empty"
+              + " to remove the field.")
+  private String registryLockEmailAddress;
+
   @Nullable
   @Parameter(
       names = "--admin",
@@ -78,6 +86,16 @@ public abstract class CreateOrUpdateUserCommand extends ConfirmingCommand {
     User.Builder builder =
         (user == null) ? new User.Builder().setEmailAddress(email) : user.asBuilder();
     builder.setUserRoles(userRolesBuilder.build());
+
+    // An empty registryLockEmailAddress indicates that we should remove the field
+    if (registryLockEmailAddress != null) {
+      if (registryLockEmailAddress.isEmpty()) {
+        builder.setRegistryLockEmailAddress(null);
+      } else {
+        builder.setRegistryLockEmailAddress(registryLockEmailAddress);
+      }
+    }
+
     User newUser = builder.build();
     UserDao.saveUser(newUser);
   }

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

@@ -71,7 +71,7 @@ public final class DomainLockUtils {
   /**
    * Creates and persists a lock request when requested by a user.
    *
-   * <p>The lock will not be applied until {@link #verifyAndApplyLock} is called.
+   * <p>The lock will not be applied until {@link #verifyVerificationCode} is called.
    */
   public RegistryLock saveNewRegistryLockRequest(
       String domainName, String registrarId, @Nullable String registrarPocId, boolean isAdmin) {
@@ -84,7 +84,7 @@ public final class DomainLockUtils {
   /**
    * Creates and persists an unlock request when requested by a user.
    *
-   * <p>The unlock will not be applied until {@link #verifyAndApplyUnlock} is called.
+   * <p>The unlock will not be applied until {@link #verifyVerificationCode} is called.
    */
   public RegistryLock saveNewRegistryUnlockRequest(
       String domainName, String registrarId, boolean isAdmin, Optional<Duration> relockDuration) {
@@ -94,62 +94,32 @@ public final class DomainLockUtils {
                     createUnlockBuilder(domainName, registrarId, isAdmin, relockDuration).build()));
   }
 
-  /** Verifies and applies the lock request previously requested by a user. */
-  public RegistryLock verifyAndApplyLock(String verificationCode, boolean isAdmin) {
-    return tm().transact(
-            () -> {
-              DateTime now = tm().getTransactionTime();
-              RegistryLock lock = getByVerificationCode(verificationCode);
-
-              checkArgument(
-                  lock.getLockCompletionTime().isEmpty(),
-                  "Domain %s is already locked",
-                  lock.getDomainName());
-
-              checkArgument(
-                  !lock.isLockRequestExpired(now),
-                  "The pending lock has expired; please try again");
-
-              checkArgument(
-                  !lock.isSuperuser() || isAdmin, "Non-admin user cannot complete admin lock");
-
-              RegistryLock newLock =
-                  RegistryLockDao.save(lock.asBuilder().setLockCompletionTime(now).build());
-              setAsRelock(newLock);
-              tm().transact(() -> applyLockStatuses(newLock, now, isAdmin));
-              return newLock;
-            });
-  }
-
-  /** Verifies and applies the unlock request previously requested by a user. */
-  public RegistryLock verifyAndApplyUnlock(String verificationCode, boolean isAdmin) {
-    RegistryLock lock =
+  /**
+   * Verifies and applies the lock/unlock request previously requested given a verification code.
+   *
+   * <p>This assumes that the lock object / domain in question has a pending lock or unlock.
+   */
+  public RegistryLock verifyVerificationCode(String verificationCode, boolean isAdmin) {
+    RegistryLock result =
         tm().transact(
                 () -> {
-                  DateTime now = tm().getTransactionTime();
-                  RegistryLock previousLock = getByVerificationCode(verificationCode);
-                  checkArgument(
-                      previousLock.getUnlockCompletionTime().isEmpty(),
-                      "Domain %s is already unlocked",
-                      previousLock.getDomainName());
-
-                  checkArgument(
-                      !previousLock.isUnlockRequestExpired(now),
-                      "The pending unlock has expired; please try again");
-
-                  checkArgument(
-                      isAdmin || !previousLock.isSuperuser(),
-                      "Non-admin user cannot complete admin unlock");
-
-                  RegistryLock newLock =
-                      RegistryLockDao.save(
-                          previousLock.asBuilder().setUnlockCompletionTime(now).build());
-                  tm().transact(() -> removeLockStatuses(newLock, isAdmin, now));
-                  return newLock;
+                  RegistryLock lock = getByVerificationCode(verificationCode);
+                  if (lock.getLockCompletionTime().isEmpty()) {
+                    return verifyAndApplyLock(lock, isAdmin);
+                  } else if (lock.getUnlockRequestTime().isPresent()
+                      && lock.getUnlockCompletionTime().isEmpty()) {
+                    return verifyAndApplyUnlock(lock, isAdmin);
+                  } else {
+                    throw new IllegalArgumentException(
+                        String.format(
+                            "Lock/unlock with code %s is already completed", verificationCode));
+                  }
                 });
-    // Submit relock outside the transaction to make sure that it fully succeeded
-    submitRelockIfNecessary(lock);
-    return lock;
+    if (result.getUnlockCompletionTime().isPresent()) {
+      // Submit relock outside the transaction to make sure that it fully succeeded
+      submitRelockIfNecessary(result);
+    }
+    return result;
   }
 
   /**
@@ -232,13 +202,36 @@ public final class DomainLockUtils {
             countdown));
   }
 
+  private RegistryLock verifyAndApplyLock(RegistryLock lock, boolean isAdmin) {
+    DateTime now = tm().getTransactionTime();
+    checkArgument(
+        !lock.isLockRequestExpired(now), "The pending lock has expired; please try again");
+
+    checkArgument(!lock.isSuperuser() || isAdmin, "Non-admin user cannot complete admin lock");
+
+    RegistryLock newLock =
+        RegistryLockDao.save(lock.asBuilder().setLockCompletionTime(now).build());
+    setAsRelock(newLock);
+    applyLockStatuses(newLock, now, isAdmin);
+    return newLock;
+  }
+
+  private RegistryLock verifyAndApplyUnlock(RegistryLock lock, boolean isAdmin) {
+    DateTime now = tm().getTransactionTime();
+    checkArgument(
+        !lock.isUnlockRequestExpired(now), "The pending unlock has expired; please try again");
+
+    checkArgument(isAdmin || !lock.isSuperuser(), "Non-admin user cannot complete admin unlock");
+
+    RegistryLock newLock =
+        RegistryLockDao.save(lock.asBuilder().setUnlockCompletionTime(now).build());
+    removeLockStatuses(newLock, isAdmin, now);
+    return newLock;
+  }
+
   private void setAsRelock(RegistryLock newLock) {
-    tm().transact(
-            () ->
-                RegistryLockDao.getMostRecentVerifiedUnlockByRepoId(newLock.getRepoId())
-                    .ifPresent(
-                        oldLock ->
-                            RegistryLockDao.save(oldLock.asBuilder().setRelock(newLock).build())));
+    RegistryLockDao.getMostRecentVerifiedUnlockByRepoId(newLock.getRepoId())
+        .ifPresent(oldLock -> RegistryLockDao.save(oldLock.asBuilder().setRelock(newLock).build()));
   }
 
   private RegistryLock.Builder createLockBuilder(

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

@@ -0,0 +1,39 @@
+// Copyright 2024 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.tools;
+
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.Parameters;
+import google.registry.model.console.User;
+import google.registry.model.console.UserDao;
+import java.util.List;
+
+/** Command to display one or more users. */
+@Parameters(separators = " =", commandDescription = "Show user(s)")
+public class GetUserCommand implements Command {
+
+  @Parameter(description = "Email address(es) of the user(s) to display", required = true)
+  private List<String> mainParameters;
+
+  @Override
+  public void run() throws Exception {
+    for (String emailAddress : mainParameters) {
+      System.out.println(
+          UserDao.loadUser(emailAddress)
+              .map(User::toString)
+              .orElse(String.format("No user with email address %s", emailAddress)));
+    }
+  }
+}

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

@@ -80,6 +80,7 @@ public final class RegistryTool {
           .put("get_routing_map", GetRoutingMapCommand.class)
           .put("get_sql_credential", GetSqlCredentialCommand.class)
           .put("get_tld", GetTldCommand.class)
+          .put("get_user", GetUserCommand.class)
           .put("ghostryde", GhostrydeCommand.class)
           .put("hash_certificate", HashCertificateCommand.class)
           .put("list_cursors", ListCursorsCommand.class)

core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java

@@ -17,8 +17,12 @@ package google.registry.ui.server.console;
 import static google.registry.request.Action.Method.GET;
 
 import com.google.api.client.http.HttpStatusCodes;
+import com.google.common.base.Throwables;
+import com.google.common.flogger.FluentLogger;
+import google.registry.model.console.ConsolePermission;
 import google.registry.model.console.GlobalRole;
 import google.registry.model.console.User;
+import google.registry.request.HttpException;
 import google.registry.request.auth.AuthResult;
 import google.registry.security.XsrfTokenManager;
 import google.registry.ui.server.registrar.ConsoleApiParams;
@@ -31,6 +35,9 @@ import java.util.Optional;
 
 /** Base class for handling Console API requests */
 public abstract class ConsoleApiAction implements Runnable {
+
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
   protected ConsoleApiParams consoleApiParams;
 
   public ConsoleApiAction(ConsoleApiParams consoleApiParams) {
@@ -51,7 +58,7 @@ public abstract class ConsoleApiAction implements Runnable {
     // This allows us to enable console to a selected cohort of users with release
     // We can ignore it in tests
     if (RegistryEnvironment.get() != RegistryEnvironment.UNITTEST
-        && !GlobalRole.FTE.equals(user.getUserRoles().getGlobalRole())) {
+        && GlobalRole.NONE.equals(user.getUserRoles().getGlobalRole())) {
       try {
         consoleApiParams.response().sendRedirect(ConsoleUiAction.PATH);
         return;
@@ -60,15 +67,36 @@ public abstract class ConsoleApiAction implements Runnable {
       }
     }
 
-    if (consoleApiParams.request().getMethod().equals(GET.toString())) {
-      getHandler(user);
-    } else {
-      if (verifyXSRF()) {
-        postHandler(user);
+    try {
+      if (consoleApiParams.request().getMethod().equals(GET.toString())) {
+        getHandler(user);
+      } else {
+        if (verifyXSRF()) {
+          postHandler(user);
+        }
       }
+    } catch (ConsolePermissionForbiddenException e) {
+      logger.atWarning().withCause(e).log("Forbidden");
+      setFailedResponse("", HttpStatusCodes.STATUS_CODE_FORBIDDEN);
+    } catch (HttpException.BadRequestException | IllegalArgumentException e) {
+      logger.atWarning().withCause(e).log("Error in request");
+      setFailedResponse(
+          Throwables.getRootCause(e).getMessage(), HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
+    } catch (Throwable t) {
+      logger.atWarning().withCause(t).log("Internal server error");
+      setFailedResponse(
+          Throwables.getRootCause(t).getMessage(), HttpStatusCodes.STATUS_CODE_SERVER_ERROR);
     }
   }
 
+  protected void checkPermission(User user, String registrarId, ConsolePermission permission) {
+    if (!user.getUserRoles().hasPermission(registrarId, permission)) {
+      throw new ConsolePermissionForbiddenException(
+          String.format(
+              "User %s does not have permission %s on registrar %s",
+              user.getEmailAddress(), permission, registrarId));
+    }
+  }
 
   protected void postHandler(User user) {
     throw new UnsupportedOperationException("Console API POST handler not implemented");
@@ -96,4 +124,10 @@ public abstract class ConsoleApiAction implements Runnable {
     return true;
   }
 
+  /** Specialized exception class used for failure when a user doesn't have the right permission. */
+  private static class ConsolePermissionForbiddenException extends RuntimeException {
+    private ConsolePermissionForbiddenException(String message) {
+      super(message);
+    }
+  }
 }

core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java

@@ -14,6 +14,7 @@
 
 package google.registry.ui.server.console;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.model.console.ConsolePermission.DOWNLOAD_DOMAINS;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
@@ -82,22 +83,11 @@ public class ConsoleDomainListAction extends ConsoleApiAction {
 
   @Override
   protected void getHandler(User user) {
-    if (!user.getUserRoles().hasPermission(registrarId, DOWNLOAD_DOMAINS)) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
-      return;
-    }
-    if (resultsPerPage < 1 || resultsPerPage > 500) {
-      setFailedResponse(
-          "Results per page must be between 1 and 500 inclusive",
-          HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
-    }
-    if (pageNumber < 0) {
-      setFailedResponse(
-          "Page number must be non-negative", HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
-    }
-
+    checkPermission(user, registrarId, DOWNLOAD_DOMAINS);
+    checkArgument(
+        resultsPerPage > 0 && resultsPerPage <= 500,
+        "Results per page must be between 1 and 500 inclusive");
+    checkArgument(pageNumber >= 0, "Page number must be non-negative");
     tm().transact(this::runInTransaction);
   }
 

core/src/main/java/google/registry/ui/server/console/ConsoleDumDownloadAction.java

@@ -58,7 +58,7 @@ public class ConsoleDumDownloadAction extends ConsoleApiAction {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
   public static final String PATH = "/console-api/dum-download";
-  private Clock clock;
+  private final Clock clock;
   private final String registrarId;
   private final String dumFileName;
 
@@ -76,11 +76,7 @@ public class ConsoleDumDownloadAction extends ConsoleApiAction {
 
   @Override
   protected void getHandler(User user) {
-    if (!user.getUserRoles().hasPermission(registrarId, ConsolePermission.DOWNLOAD_DOMAINS)) {
-      consoleApiParams.response().setStatus(HttpServletResponse.SC_FORBIDDEN);
-      return;
-    }
-
+    checkPermission(user, registrarId, ConsolePermission.DOWNLOAD_DOMAINS);
     consoleApiParams.response().setContentType(MediaType.CSV_UTF_8);
     consoleApiParams
         .response()

core/src/main/java/google/registry/ui/server/console/ConsoleEppPasswordAction.java

@@ -14,20 +14,20 @@
 
 package google.registry.ui.server.console;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.request.Action.Method.POST;
-import static google.registry.request.RequestParameters.extractRequiredParameter;
 
 import com.google.api.client.http.HttpStatusCodes;
-import com.google.common.base.Throwables;
-import com.google.common.flogger.FluentLogger;
+import com.google.common.base.Strings;
+import com.google.gson.annotations.Expose;
 import google.registry.flows.EppException.AuthenticationErrorException;
 import google.registry.flows.PasswordOnlyTransportCredentials;
 import google.registry.groups.GmailClient;
 import google.registry.model.console.User;
 import google.registry.model.registrar.Registrar;
 import google.registry.request.Action;
-import google.registry.request.HttpException.BadRequestException;
+import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
 import google.registry.request.auth.AuthenticatedRegistrarAccessor;
 import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException;
@@ -43,9 +43,6 @@ import javax.mail.internet.InternetAddress;
     method = {POST},
     auth = Auth.AUTH_PUBLIC_LOGGED_IN)
 public class ConsoleEppPasswordAction extends ConsoleApiAction {
-
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
   protected static final String EMAIL_SUBJ = "EPP password update confirmation";
   protected static final String EMAIL_BODY =
       "Dear %s,\n" + "This is to confirm that your account password has been changed.";
@@ -57,70 +54,71 @@ public class ConsoleEppPasswordAction extends ConsoleApiAction {
   private final AuthenticatedRegistrarAccessor registrarAccessor;
   private final GmailClient gmailClient;
 
+  private final Optional<EppPasswordData> eppPasswordChangeRequest;
+
   @Inject
   public ConsoleEppPasswordAction(
       ConsoleApiParams consoleApiParams,
       AuthenticatedRegistrarAccessor registrarAccessor,
-      GmailClient gmailClient) {
+      GmailClient gmailClient,
+      @Parameter("eppPasswordChangeRequest") Optional<EppPasswordData> eppPasswordChangeRequest) {
     super(consoleApiParams);
     this.registrarAccessor = registrarAccessor;
     this.gmailClient = gmailClient;
+    this.eppPasswordChangeRequest = eppPasswordChangeRequest;
+  }
+
+  private void confirmParamsAvailable() {
+    checkArgument(this.eppPasswordChangeRequest.isPresent(), "Epp Password update body is invalid");
+    var eppRequestBody = this.eppPasswordChangeRequest.get();
+    var errorMsg = "Missing param(s): %s";
+    checkArgument(!Strings.isNullOrEmpty(eppRequestBody.registrarId()), errorMsg, "registrarId");
+    checkArgument(!Strings.isNullOrEmpty(eppRequestBody.oldPassword()), errorMsg, "oldPassword");
+    checkArgument(!Strings.isNullOrEmpty(eppRequestBody.newPassword()), errorMsg, "newPassword");
+    checkArgument(
+        !Strings.isNullOrEmpty(eppRequestBody.newPasswordRepeat()), errorMsg, "newPasswordRepeat");
   }
 
   @Override
   protected void postHandler(User user) {
-    String registrarId;
-    String oldPassword;
-    String newPassword;
-    String newPasswordRepeat;
+    this.confirmParamsAvailable();
 
-    try {
-      registrarId = extractRequiredParameter(consoleApiParams.request(), "registrarId");
-      oldPassword = extractRequiredParameter(consoleApiParams.request(), "oldPassword");
-      newPassword = extractRequiredParameter(consoleApiParams.request(), "newPassword");
-      newPasswordRepeat = extractRequiredParameter(consoleApiParams.request(), "newPasswordRepeat");
-    } catch (BadRequestException e) {
-      setFailedResponse(e.getMessage(), HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
-    }
-
-    if (!newPassword.equals(newPasswordRepeat)) {
-      setFailedResponse("New password fields don't match", HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
-    }
+    var eppRequestBody = this.eppPasswordChangeRequest.get();
+    checkArgument(
+        eppRequestBody.newPassword().equals(eppRequestBody.newPasswordRepeat()),
+        "New password fields don't match");
 
     Registrar registrar;
     try {
-      registrar = registrarAccessor.getRegistrar(registrarId);
+      registrar = registrarAccessor.getRegistrar(eppRequestBody.registrarId());
     } catch (RegistrarAccessDeniedException e) {
       setFailedResponse(e.getMessage(), HttpStatusCodes.STATUS_CODE_NOT_FOUND);
       return;
     }
 
     try {
-      credentials.validate(registrar, oldPassword);
+      credentials.validate(registrar, eppRequestBody.oldPassword());
     } catch (AuthenticationErrorException e) {
       setFailedResponse(e.getMessage(), HttpStatusCodes.STATUS_CODE_FORBIDDEN);
       return;
     }
 
-    try {
-      tm().transact(
-              () -> {
-                tm().put(registrar.asBuilder().setPassword(newPassword).build());
-                this.gmailClient.sendEmail(
-                    EmailMessage.create(
-                        EMAIL_SUBJ,
-                        String.format(EMAIL_BODY, registrar.getRegistrarName()),
-                        new InternetAddress(registrar.getEmailAddress(), true)));
-              });
-    } catch (Throwable e) {
-      logger.atWarning().withCause(e).log("Failed to update password.");
-      String message =
-          Optional.ofNullable(Throwables.getRootCause(e).getMessage()).orElse("Unspecified error");
-      setFailedResponse(message, HttpStatusCodes.STATUS_CODE_SERVER_ERROR);
-    }
+    tm().transact(
+            () -> {
+              tm().put(registrar.asBuilder().setPassword(eppRequestBody.newPassword()).build());
+              this.gmailClient.sendEmail(
+                  EmailMessage.create(
+                      EMAIL_SUBJ,
+                      String.format(EMAIL_BODY, registrar.getRegistrarName()),
+                      new InternetAddress(registrar.getEmailAddress(), true)));
+            });
 
     consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_OK);
   }
+
+  public record EppPasswordData(
+      @Expose String registrarId,
+      @Expose String oldPassword,
+      @Expose String newPassword,
+      @Expose String newPasswordRepeat) {}
 }

core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockAction.java

@@ -14,6 +14,7 @@
 
 package google.registry.ui.server.console;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.request.Action.Method.GET;
@@ -26,7 +27,6 @@ import static google.registry.ui.server.registrar.RegistryLockPostAction.VERIFIC
 
 import com.google.api.client.http.HttpStatusCodes;
 import com.google.common.collect.ImmutableList;
-import com.google.common.flogger.FluentLogger;
 import com.google.gson.Gson;
 import google.registry.flows.EppException;
 import google.registry.flows.domain.DomainFlowUtils;
@@ -37,7 +37,6 @@ import google.registry.model.domain.RegistryLock;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.tld.RegistryLockDao;
 import google.registry.request.Action;
-import google.registry.request.HttpException;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
@@ -66,8 +65,6 @@ import org.joda.time.Duration;
     auth = Auth.AUTH_PUBLIC_LOGGED_IN)
 public class ConsoleRegistryLockAction extends ConsoleApiAction {
 
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
   static final String PATH = "/console-api/registry-lock";
 
   private final DomainLockUtils domainLockUtils;
@@ -91,10 +88,7 @@ public class ConsoleRegistryLockAction extends ConsoleApiAction {
 
   @Override
   protected void getHandler(User user) {
-    if (!user.getUserRoles().hasPermission(registrarId, ConsolePermission.REGISTRY_LOCK)) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
-      return;
-    }
+    checkPermission(user, registrarId, ConsolePermission.REGISTRY_LOCK);
     consoleApiParams.response().setPayload(gson.toJson(getLockedDomains()));
     consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_OK);
   }
@@ -104,45 +98,31 @@ public class ConsoleRegistryLockAction extends ConsoleApiAction {
     HttpServletRequest req = consoleApiParams.request();
     Response response = consoleApiParams.response();
     // User must have the proper permission on the registrar
-    if (!user.getUserRoles().hasPermission(registrarId, ConsolePermission.REGISTRY_LOCK)) {
-      setFailedResponse("", HttpStatusCodes.STATUS_CODE_FORBIDDEN);
-      return;
-    }
+    checkPermission(user, registrarId, ConsolePermission.REGISTRY_LOCK);
 
     // Shouldn't happen, but double-check the registrar has registry lock enabled
     Registrar registrar = Registrar.loadByRegistrarIdCached(registrarId).get();
-    if (!registrar.isRegistryLockAllowed()) {
-      setFailedResponse(
-          String.format("Registry lock not allowed for registrar %s", registrarId),
-          HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
-    }
+    checkArgument(
+        registrar.isRegistryLockAllowed(),
+        "Registry lock not allowed for registrar %s",
+        registrarId);
 
     // Retrieve and validate the necessary params
-    String domainName;
-    boolean isLock;
-    Optional<String> maybePassword;
-    Optional<Long> relockDurationMillis;
+    String domainName = extractRequiredParameter(req, "domainName");
+    boolean isLock = extractBooleanParameter(req, "isLock");
+    Optional<String> maybePassword = extractOptionalParameter(req, "password");
+    Optional<Long> relockDurationMillis = extractOptionalLongParameter(req, "relockDurationMillis");
 
     try {
-      domainName = extractRequiredParameter(req, "domainName");
-      isLock = extractBooleanParameter(req, "isLock");
-      maybePassword = extractOptionalParameter(req, "password");
-      relockDurationMillis = extractOptionalLongParameter(req, "relockDurationMillis");
       DomainFlowUtils.validateDomainName(domainName);
-    } catch (HttpException.BadRequestException | EppException e) {
-      logger.atWarning().withCause(e).log("Bad request when attempting registry lock/unlock");
-      setFailedResponse(e.getMessage(), HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
+    } catch (EppException e) {
+      throw new IllegalArgumentException(e);
     }
 
     // Passwords aren't required for admin users, otherwise we need to validate it
     boolean isAdmin = user.getUserRoles().isAdmin();
     if (!isAdmin) {
-      if (maybePassword.isEmpty()) {
-        setFailedResponse("No password provided", HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-        return;
-      }
+      checkArgument(maybePassword.isPresent(), "No password provided");
       if (!user.verifyRegistryLockPassword(maybePassword.get())) {
         setFailedResponse(
             "Incorrect registry lock password", HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
@@ -150,31 +130,23 @@ public class ConsoleRegistryLockAction extends ConsoleApiAction {
       }
     }
 
-    String userEmail = user.getEmailAddress();
-    try {
-      tm().transact(
-              () -> {
-                RegistryLock registryLock =
-                    isLock
-                        ? domainLockUtils.saveNewRegistryLockRequest(
-                            domainName, registrarId, userEmail, isAdmin)
-                        : domainLockUtils.saveNewRegistryUnlockRequest(
-                            domainName,
-                            registrarId,
-                            isAdmin,
-                            relockDurationMillis.map(Duration::new));
-                sendVerificationEmail(registryLock, userEmail, isLock);
-              });
-    } catch (IllegalArgumentException e) {
-      // Catch IllegalArgumentExceptions separately to give a nicer error message and code
-      logger.atWarning().withCause(e).log("Failed to lock/unlock domain");
-      setFailedResponse(e.getMessage(), HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
-    } catch (Throwable t) {
-      logger.atWarning().withCause(t).log("Failed to lock/unlock domain");
-      setFailedResponse("Internal server error", HttpStatusCodes.STATUS_CODE_SERVER_ERROR);
-      return;
-    }
+    String registryLockEmail =
+        user.getRegistryLockEmailAddress()
+            .orElseThrow(
+                () -> new IllegalArgumentException("User has no registry lock email address"));
+    tm().transact(
+            () -> {
+              RegistryLock registryLock =
+                  isLock
+                      ? domainLockUtils.saveNewRegistryLockRequest(
+                          domainName, registrarId, registryLockEmail, isAdmin)
+                      : domainLockUtils.saveNewRegistryUnlockRequest(
+                          domainName,
+                          registrarId,
+                          isAdmin,
+                          relockDurationMillis.map(Duration::new));
+              sendVerificationEmail(registryLock, registryLockEmail, isLock);
+            });
     response.setStatus(HttpStatusCodes.STATUS_CODE_OK);
   }
 
@@ -187,7 +159,6 @@ public class ConsoleRegistryLockAction extends ConsoleApiAction {
               // TODO: replace this with the PATH in ConsoleRegistryLockVerifyAction once it exists
               .setPath("/console-api/registry-lock-verify")
               .setParameter("lockVerificationCode", lock.getVerificationCode())
-              .setParameter("isLock", String.valueOf(isLock))
               .build()
               .toString();
       String body = String.format(VERIFICATION_EMAIL_TEMPLATE, lock.getDomainName(), url);

core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java

@@ -27,6 +27,7 @@ import com.google.gson.Gson;
 import google.registry.model.console.ConsolePermission;
 import google.registry.model.console.User;
 import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.RegistrarBase;
 import google.registry.model.registrar.RegistrarBase.State;
 import google.registry.model.registrar.RegistrarPoc;
 import google.registry.request.Action;
@@ -46,11 +47,13 @@ import javax.inject.Named;
 public class RegistrarsAction extends ConsoleApiAction {
   private static final int PASSWORD_LENGTH = 16;
   private static final int PASSCODE_LENGTH = 5;
+  private static final ImmutableList<RegistrarBase.Type> allowedRegistrarTypes =
+      ImmutableList.of(Registrar.Type.REAL, RegistrarBase.Type.OTE);
   static final String PATH = "/console-api/registrars";
   private final Gson gson;
-  private Optional<Registrar> registrar;
-  private StringGenerator passwordGenerator;
-  private StringGenerator passcodeGenerator;
+  private final Optional<Registrar> registrar;
+  private final StringGenerator passwordGenerator;
+  private final StringGenerator passcodeGenerator;
 
   @Inject
   public RegistrarsAction(
@@ -72,9 +75,10 @@ public class RegistrarsAction extends ConsoleApiAction {
       consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
       return;
     }
+
     ImmutableList<Registrar> registrars =
         Streams.stream(Registrar.loadAll())
-            .filter(r -> r.getType() == Registrar.Type.REAL)
+            .filter(r -> allowedRegistrarTypes.contains(r.getType()))
             .collect(ImmutableList.toImmutableList());
 
     consoleApiParams.response().setPayload(gson.toJson(registrars));
@@ -88,73 +92,62 @@ public class RegistrarsAction extends ConsoleApiAction {
       return;
     }
 
-    if (registrar.isEmpty()) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      consoleApiParams.response().setPayload(gson.toJson("'registrar' parameter is not present"));
-      return;
-    }
-
-    Registrar registrarParam = registrar.get();
+    Registrar registrarParam =
+        registrar.orElseThrow(
+            () -> new IllegalArgumentException("'registrar' parameter is not present"));
     String errorMsg = "Missing value for %s";
-    try {
-      checkArgument(!isNullOrEmpty(registrarParam.getRegistrarId()), errorMsg, "registrarId");
-      checkArgument(!isNullOrEmpty(registrarParam.getRegistrarName()), errorMsg, "name");
-      checkArgument(!registrarParam.getBillingAccountMap().isEmpty(), errorMsg, "billingAccount");
-      checkArgument(registrarParam.getIanaIdentifier() != null, String.format(errorMsg, "ianaId"));
-      checkArgument(
-          !isNullOrEmpty(registrarParam.getIcannReferralEmail()), errorMsg, "referralEmail");
-      checkArgument(!isNullOrEmpty(registrarParam.getDriveFolderId()), errorMsg, "driveId");
-      checkArgument(!isNullOrEmpty(registrarParam.getEmailAddress()), errorMsg, "consoleUserEmail");
-      checkArgument(
-          registrarParam.getLocalizedAddress() != null
-              && !isNullOrEmpty(registrarParam.getLocalizedAddress().getState())
-              && !isNullOrEmpty(registrarParam.getLocalizedAddress().getCity())
-              && !isNullOrEmpty(registrarParam.getLocalizedAddress().getZip())
-              && !isNullOrEmpty(registrarParam.getLocalizedAddress().getCountryCode())
-              && !registrarParam.getLocalizedAddress().getStreet().isEmpty(),
-          errorMsg,
-          "address");
+    checkArgument(!isNullOrEmpty(registrarParam.getRegistrarId()), errorMsg, "registrarId");
+    checkArgument(!isNullOrEmpty(registrarParam.getRegistrarName()), errorMsg, "name");
+    checkArgument(!registrarParam.getBillingAccountMap().isEmpty(), errorMsg, "billingAccount");
+    checkArgument(registrarParam.getIanaIdentifier() != null, String.format(errorMsg, "ianaId"));
+    checkArgument(
+        !isNullOrEmpty(registrarParam.getIcannReferralEmail()), errorMsg, "referralEmail");
+    checkArgument(!isNullOrEmpty(registrarParam.getDriveFolderId()), errorMsg, "driveId");
+    checkArgument(!isNullOrEmpty(registrarParam.getEmailAddress()), errorMsg, "consoleUserEmail");
+    checkArgument(
+        registrarParam.getLocalizedAddress() != null
+            && !isNullOrEmpty(registrarParam.getLocalizedAddress().getState())
+            && !isNullOrEmpty(registrarParam.getLocalizedAddress().getCity())
+            && !isNullOrEmpty(registrarParam.getLocalizedAddress().getZip())
+            && !isNullOrEmpty(registrarParam.getLocalizedAddress().getCountryCode())
+            && !registrarParam.getLocalizedAddress().getStreet().isEmpty(),
+        errorMsg,
+        "address");
 
-      String password = passwordGenerator.createString(PASSWORD_LENGTH);
-      String phonePasscode = passcodeGenerator.createString(PASSCODE_LENGTH);
+    String password = passwordGenerator.createString(PASSWORD_LENGTH);
+    String phonePasscode = passcodeGenerator.createString(PASSCODE_LENGTH);
 
-      Registrar registrar =
-          new Registrar.Builder()
-              .setRegistrarId(registrarParam.getRegistrarId())
-              .setRegistrarName(registrarParam.getRegistrarName())
-              .setBillingAccountMap(registrarParam.getBillingAccountMap())
-              .setIanaIdentifier(Long.valueOf(registrarParam.getIanaIdentifier()))
-              .setIcannReferralEmail(registrarParam.getIcannReferralEmail())
-              .setEmailAddress(registrarParam.getIcannReferralEmail())
-              .setDriveFolderId(registrarParam.getDriveFolderId())
-              .setType(Registrar.Type.REAL)
-              .setPassword(password)
-              .setPhonePasscode(phonePasscode)
-              .setState(State.PENDING)
-              .setLocalizedAddress(registrarParam.getLocalizedAddress())
-              .build();
+    Registrar registrar =
+        new Registrar.Builder()
+            .setRegistrarId(registrarParam.getRegistrarId())
+            .setRegistrarName(registrarParam.getRegistrarName())
+            .setBillingAccountMap(registrarParam.getBillingAccountMap())
+            .setIanaIdentifier(registrarParam.getIanaIdentifier())
+            .setIcannReferralEmail(registrarParam.getIcannReferralEmail())
+            .setEmailAddress(registrarParam.getIcannReferralEmail())
+            .setDriveFolderId(registrarParam.getDriveFolderId())
+            .setType(Registrar.Type.REAL)
+            .setPassword(password)
+            .setPhonePasscode(phonePasscode)
+            .setState(State.PENDING)
+            .setLocalizedAddress(registrarParam.getLocalizedAddress())
+            .build();
 
-      RegistrarPoc contact =
-          new RegistrarPoc.Builder()
-              .setRegistrar(registrar)
-              .setName(registrarParam.getEmailAddress())
-              .setEmailAddress(registrarParam.getEmailAddress())
-              .setLoginEmailAddress(registrarParam.getEmailAddress())
-              .build();
+    RegistrarPoc contact =
+        new RegistrarPoc.Builder()
+            .setRegistrar(registrar)
+            .setName(registrarParam.getEmailAddress())
+            .setEmailAddress(registrarParam.getEmailAddress())
+            .setLoginEmailAddress(registrarParam.getEmailAddress())
+            .build();
 
-      tm().transact(
-              () -> {
-                checkArgument(
-                    Registrar.loadByRegistrarId(registrar.getRegistrarId()).isEmpty(),
-                    "Registrar with registrarId %s already exists",
-                    registrar.getRegistrarId());
-                tm().putAll(registrar, contact);
-              });
-
-    } catch (IllegalArgumentException e) {
-      setFailedResponse(e.getMessage(), HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-    } catch (Throwable e) {
-      setFailedResponse(e.getMessage(), HttpStatusCodes.STATUS_CODE_SERVER_ERROR);
-    }
+    tm().transact(
+            () -> {
+              checkArgument(
+                  Registrar.loadByRegistrarId(registrar.getRegistrarId()).isEmpty(),
+                  "Registrar with registrarId %s already exists",
+                  registrar.getRegistrarId());
+              tm().putAll(registrar, contact);
+            });
   }
 }

core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java

@@ -14,6 +14,7 @@
 
 package google.registry.ui.server.console.settings;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.request.Action.Method.GET;
@@ -66,11 +67,7 @@ public class ContactAction extends ConsoleApiAction {
 
   @Override
   protected void getHandler(User user) {
-    if (!user.getUserRoles().hasPermission(registrarId, ConsolePermission.VIEW_REGISTRAR_DETAILS)) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
-      return;
-    }
-
+    checkPermission(user, registrarId, ConsolePermission.VIEW_REGISTRAR_DETAILS);
     ImmutableList<RegistrarPoc> am =
         tm().transact(
                 () ->
@@ -87,17 +84,8 @@ public class ContactAction extends ConsoleApiAction {
 
   @Override
   protected void postHandler(User user) {
-    if (!user.getUserRoles().hasPermission(registrarId, ConsolePermission.EDIT_REGISTRAR_DETAILS)) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
-      return;
-    }
-
-    if (contacts.isEmpty()) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      consoleApiParams.response().setPayload(gson.toJson("Contacts parameter is not present"));
-      return;
-    }
-
+    checkPermission(user, registrarId, ConsolePermission.EDIT_REGISTRAR_DETAILS);
+    checkArgument(contacts.isPresent(), "Contacts parameter is not present");
     Registrar registrar =
         Registrar.loadByRegistrarId(registrarId)
             .orElseThrow(
@@ -120,9 +108,7 @@ public class ContactAction extends ConsoleApiAction {
     } catch (FormException e) {
       logger.atWarning().withCause(e).log(
           "Error processing contacts post request for registrar: %s", registrarId);
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      consoleApiParams.response().setPayload(e.getMessage());
-      return;
+      throw new IllegalArgumentException(e);
     }
 
     RegistrarPoc.updateContacts(registrar, updatedContacts);

core/src/main/java/google/registry/ui/server/console/settings/SecurityAction.java

@@ -14,6 +14,7 @@
 
 package google.registry.ui.server.console.settings;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.request.Action.Method.POST;
 
@@ -62,16 +63,8 @@ public class SecurityAction extends ConsoleApiAction {
 
   @Override
   protected void postHandler(User user) {
-    if (!user.getUserRoles().hasPermission(registrarId, ConsolePermission.EDIT_REGISTRAR_DETAILS)) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
-      return;
-    }
-
-    if (registrar.isEmpty()) {
-      setFailedResponse(
-          "'registrar' parameter is not present", HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
-    }
+    checkPermission(user, registrarId, ConsolePermission.EDIT_REGISTRAR_DETAILS);
+    checkArgument(registrar.isPresent(), "'registrar' parameter is not present");
 
     Registrar savedRegistrar;
     try {

core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java

@@ -14,6 +14,7 @@
 
 package google.registry.ui.server.console.settings;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.request.Action.Method.POST;
 
@@ -45,8 +46,8 @@ import javax.inject.Inject;
 public class WhoisRegistrarFieldsAction extends ConsoleApiAction {
 
   static final String PATH = "/console-api/settings/whois-fields";
-  private AuthenticatedRegistrarAccessor registrarAccessor;
-  private Optional<Registrar> registrar;
+  private final AuthenticatedRegistrarAccessor registrarAccessor;
+  private final Optional<Registrar> registrar;
 
   @Inject
   public WhoisRegistrarFieldsAction(
@@ -60,19 +61,9 @@ public class WhoisRegistrarFieldsAction extends ConsoleApiAction {
 
   @Override
   protected void postHandler(User user) {
-    if (registrar.isEmpty()) {
-      setFailedResponse(
-          "'registrar' parameter is not present", HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
-      return;
-    }
-
-    if (!user.getUserRoles()
-        .hasPermission(
-            registrar.get().getRegistrarId(), ConsolePermission.EDIT_REGISTRAR_DETAILS)) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
-      return;
-    }
-
+    checkArgument(registrar.isPresent(), "'registrar' parameter is not present");
+    checkPermission(
+        user, registrar.get().getRegistrarId(), ConsolePermission.EDIT_REGISTRAR_DETAILS);
     tm().transact(() -> loadAndModifyRegistrar(registrar.get()));
   }
 
@@ -82,8 +73,7 @@ public class WhoisRegistrarFieldsAction extends ConsoleApiAction {
       // reload to make sure the object has all the correct fields
       savedRegistrar = registrarAccessor.getRegistrar(providedRegistrar.getRegistrarId());
     } catch (RegistrarAccessDeniedException e) {
-      consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
-      consoleApiParams.response().setPayload(e.getMessage());
+      setFailedResponse(e.getMessage(), HttpStatusCodes.STATUS_CODE_FORBIDDEN);
       return;
     }
 

core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleModule.java

@@ -32,6 +32,7 @@ import google.registry.request.RequestScope;
 import google.registry.request.Response;
 import google.registry.request.auth.AuthResult;
 import google.registry.security.XsrfTokenManager;
+import google.registry.ui.server.console.ConsoleEppPasswordAction.EppPasswordData;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.Optional;
 import org.joda.time.DateTime;
@@ -232,4 +233,11 @@ public final class RegistrarConsoleModule {
   public static Optional<String> provideSearchTerm(HttpServletRequest req) {
     return extractOptionalParameter(req, "searchTerm");
   }
+
+  @Provides
+  @Parameter("eppPasswordChangeRequest")
+  public static Optional<EppPasswordData> provideEppPasswordChangeRequest(
+      Gson gson, @OptionalJsonPayload Optional<JsonElement> payload) {
+    return payload.map(s -> gson.fromJson(s, EppPasswordData.class));
+  }
 }

core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java

@@ -160,7 +160,6 @@ public class RegistryLockPostAction implements Runnable, JsonActionRunner.JsonAc
               .setHost(req.getServerName())
               .setPath("registry-lock-verify")
               .setParameter("lockVerificationCode", lock.getVerificationCode())
-              .setParameter("isLock", String.valueOf(isLock))
               .build()
               .toString();
       String body = String.format(VERIFICATION_EMAIL_TEMPLATE, lock.getDomainName(), url);
@@ -199,7 +198,8 @@ public class RegistryLockPostAction implements Runnable, JsonActionRunner.JsonAc
     checkArgument(
         user.verifyRegistryLockPassword(postInput.password),
         "Incorrect registry lock password for user");
-    return user.getEmailAddress();
+    return user.getRegistryLockEmailAddress()
+        .orElseThrow(() -> new IllegalArgumentException("User has no registry lock email address"));
   }
 
   private String verifyPasswordAndGetEmailLegacyUser(User user, RegistryLockPostInput postInput)

core/src/main/java/google/registry/ui/server/registrar/RegistryLockVerifyAction.java

@@ -50,29 +50,22 @@ public final class RegistryLockVerifyAction extends HtmlAction {
 
   private final DomainLockUtils domainLockUtils;
   private final String lockVerificationCode;
-  private final Boolean isLock;
 
   @Inject
   public RegistryLockVerifyAction(
       DomainLockUtils domainLockUtils,
-      @Parameter("lockVerificationCode") String lockVerificationCode,
-      @Parameter("isLock") Boolean isLock) {
+      @Parameter("lockVerificationCode") String lockVerificationCode) {
     this.domainLockUtils = domainLockUtils;
     this.lockVerificationCode = lockVerificationCode;
-    this.isLock = isLock;
   }
 
   @Override
   public void runAfterLogin(Map<String, Object> data) {
     try {
       boolean isAdmin = authResult.userAuthInfo().get().isUserAdmin();
-      final RegistryLock resultLock;
-      if (isLock) {
-        resultLock = domainLockUtils.verifyAndApplyLock(lockVerificationCode, isAdmin);
-      } else {
-        resultLock = domainLockUtils.verifyAndApplyUnlock(lockVerificationCode, isAdmin);
-      }
-      data.put("isLock", isLock);
+      RegistryLock resultLock =
+          domainLockUtils.verifyVerificationCode(lockVerificationCode, isAdmin);
+      data.put("isLock", resultLock.getUnlockCompletionTime().isEmpty());
       data.put("success", true);
       data.put("domainName", resultLock.getDomainName());
     } catch (Throwable t) {

core/src/test/java/google/registry/beam/BeamUtilsTest.java

@@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.google.common.collect.ImmutableList;
+import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
@@ -55,10 +56,13 @@ class BeamUtilsTest {
   }
 
   @Test
-  void testExtractField_fieldDoesntExist_returnsNull() {
+  void testExtractField_fieldDoesntExist_throwsException() {
     schemaAndRecord.getRecord().put("aFloat", null);
-    assertThat(BeamUtils.extractField(schemaAndRecord.getRecord(), "aFloat")).isEqualTo("null");
-    assertThat(BeamUtils.extractField(schemaAndRecord.getRecord(), "missing")).isEqualTo("null");
+    AvroRuntimeException expected =
+        assertThrows(
+            AvroRuntimeException.class,
+            () -> BeamUtils.extractField(schemaAndRecord.getRecord(), "missing"));
+    assertThat(expected).hasMessageThat().isEqualTo("Not a valid schema field: missing");
   }
 
   @Test
@@ -68,16 +72,12 @@ class BeamUtilsTest {
 
   @Test
   void testCheckFieldsNotNull_fieldMissing_throwsException() {
-    IllegalStateException expected =
+    AvroRuntimeException expected =
         assertThrows(
-            IllegalStateException.class,
+            AvroRuntimeException.class,
             () ->
                 BeamUtils.checkFieldsNotNull(
                     ImmutableList.of("aString", "aFloat", "notAField"), schemaAndRecord));
-    assertThat(expected)
-        .hasMessageThat()
-        .isEqualTo(
-            "Read unexpected null value for field(s) notAField for record "
-                + "{\"aString\": \"hello world\", \"aFloat\": 2.54}");
+    assertThat(expected).hasMessageThat().isEqualTo("Not a valid schema field: notAField");
   }
 }

core/src/test/java/google/registry/bsa/BsaDiffCreatorTest.java

@@ -47,11 +47,9 @@ class BsaDiffCreatorTest {
 
   @Mock GcsClient gcsClient;
 
-  @SuppressWarnings("DoNotMockAutoValue")
   @Mock
   DownloadSchedule schedule;
 
-  @SuppressWarnings("DoNotMockAutoValue")
   @Mock
   CompletedJob completedJob;
 

core/src/test/java/google/registry/bsa/persistence/LabelDiffUpdatesTest.java

@@ -60,7 +60,6 @@ class LabelDiffUpdatesTest {
 
   @Mock IdnChecker idnChecker;
 
-  @SuppressWarnings("DoNotMockAutoValue")
   @Mock
   DownloadSchedule schedule;
 

core/src/test/java/google/registry/model/tld/TldTest.java

@@ -149,7 +149,6 @@ public final class TldTest extends EntityTestCase {
             .setDnsAPlusAaaaTtl(Duration.standardHours(1))
             .setDnsWriters(ImmutableSet.of("baz", "bang"))
             // set create billing cost back to the default (database helper sets it to $13)
-            .setCreateBillingCost(Money.of(USD, 8))
             .setEapFeeSchedule(
                 ImmutableSortedMap.of(
                     START_OF_TIME,
@@ -171,7 +170,7 @@ public final class TldTest extends EntityTestCase {
 
   @Test
   void testSuccess_tldYamlRoundtrip() throws Exception {
-    Tld testTld = createTld("test").asBuilder().setCreateBillingCost(Money.of(USD, 8)).build();
+    Tld testTld = createTld("test");
     ObjectMapper mapper = createObjectMapper();
     String yaml = mapper.writeValueAsString(testTld);
     Tld constructedTld = mapper.readValue(yaml, Tld.class);
@@ -610,15 +609,6 @@ public final class TldTest extends EntityTestCase {
     assertThat(thrown).hasMessageThat().contains("billing cost cannot be negative");
   }
 
-  @Test
-  void testFailure_negativeCreateBillingCost() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> Tld.get("tld").asBuilder().setCreateBillingCost(Money.of(USD, -42)));
-    assertThat(thrown).hasMessageThat().contains("createBillingCost cannot be negative");
-  }
-
   @Test
   void testFailure_negativeRestoreBillingCost() {
     IllegalArgumentException thrown =

core/src/test/java/google/registry/testing/DatabaseHelper.java

@@ -248,7 +248,6 @@ public final class DatabaseHelper {
         // Set billing costs to distinct small primes to avoid masking bugs in tests.
         .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 11)))
         .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(USD)))
-        .setCreateBillingCost(Money.of(USD, 13))
         .setCreateBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 13)))
         .setRestoreBillingCost(Money.of(USD, 17))
         .setServerStatusChangeBillingCost(Money.of(USD, 19))

core/src/test/java/google/registry/tools/ConfigureTldCommandTest.java

@@ -176,54 +176,6 @@ public class ConfigureTldCommandTest extends CommandTestCase<ConfigureTldCommand
     assertThat(updatedTld.getCreateBillingCost(fakeClock.nowUtc())).isEqualTo(Money.of(USD, 25));
   }
 
-  @Test
-  void testSuccess_fileMissingCreateBillingCostTransitions() throws Exception {
-    createTld("nocreatecostmap");
-    File tldFile = tmpDir.resolve("nocreatecostmap.yaml").toFile();
-    Files.asCharSink(tldFile, UTF_8).write(loadFile(getClass(), "nocreatecostmap.yaml"));
-    runCommandForced("--input=" + tldFile);
-    Tld updatedTld = Tld.get("nocreatecostmap");
-    assertThat(updatedTld.getCreateBillingCostTransitions())
-        .isEqualTo(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 25)));
-  }
-
-  @Test
-  void testSuccess_fileHasCreateBillingCost() throws Exception {
-    createTld("withcreatecost");
-    File tldFile = tmpDir.resolve("withcreatecost.yaml").toFile();
-    Files.asCharSink(tldFile, UTF_8).write(loadFile(getClass(), "withcreatecost.yaml"));
-    runCommandForced("--input=" + tldFile);
-    Tld updatedTld = Tld.get("withcreatecost");
-    assertThat(updatedTld.getCreateBillingCost()).isEqualTo(Money.of(USD, 8));
-  }
-
-  @Test
-  void testSuccess_fileMissingCreateBillingCostTransitionsRevertsToBasicConstructedMap()
-      throws Exception {
-    ImmutableSortedMap<DateTime, Money> createCostTransitions =
-        ImmutableSortedMap.of(
-            START_OF_TIME,
-            Money.of(USD, 8),
-            fakeClock.nowUtc(),
-            Money.of(USD, 1),
-            fakeClock.nowUtc().plusMonths(1),
-            Money.of(USD, 2),
-            fakeClock.nowUtc().plusMonths(2),
-            Money.of(USD, 3));
-    Tld tld =
-        createTld("nocreatecostmap")
-            .asBuilder()
-            .setCreateBillingCostTransitions(createCostTransitions)
-            .build();
-    assertThat(tld.getCreateBillingCostTransitions().size()).isEqualTo(4);
-    File tldFile = tmpDir.resolve("nocreatecostmap.yaml").toFile();
-    Files.asCharSink(tldFile, UTF_8).write(loadFile(getClass(), "nocreatecostmap.yaml"));
-    runCommandForced("--input=" + tldFile);
-    Tld updatedTld = Tld.get("nocreatecostmap");
-    assertThat(updatedTld.getCreateBillingCostTransitions())
-        .isEqualTo(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 25)));
-  }
-
   @Test
   void testFailure_fileMissingNullableFieldsOnCreate() throws Exception {
     File tldFile = tmpDir.resolve("missingnullablefields.yaml").toFile();
@@ -236,20 +188,6 @@ public class ConfigureTldCommandTest extends CommandTestCase<ConfigureTldCommand
                 + " premiumListName, currency, numDnsPublishLocks]");
   }
 
-  @Test
-  void testSuccess_addCreateBillingCostTransitions() throws Exception {
-    createTld("costmap");
-    File tldFile = tmpDir.resolve("costmap.yaml").toFile();
-    Files.asCharSink(tldFile, UTF_8).write(loadFile(getClass(), "costmap.yaml"));
-    runCommandForced("--input=" + tldFile);
-    Tld updatedTld = Tld.get("costmap");
-    ImmutableSortedMap<DateTime, Money> costTransitions =
-        updatedTld.getCreateBillingCostTransitions();
-    assertThat(costTransitions.size()).isEqualTo(3);
-    assertThat(costTransitions.get(START_OF_TIME)).isEqualTo(Money.of(USD, 13));
-    assertThat(costTransitions.get(START_OF_TIME.plusYears(26))).isEqualTo(Money.of(USD, 14));
-  }
-
   @Test
   void testFailure_fileMissingNullableFieldOnUpdate() throws Exception {
     Tld tld = createTld("missingnullablefields");

core/src/test/java/google/registry/tools/CreateUserCommandTest.java

@@ -53,6 +53,17 @@ public class CreateUserCommandTest extends CommandTestCase<CreateUserCommand> {
     verifyNoMoreInteractions(iamClient);
   }
 
+  @Test
+  void testSuccess_registryLock() throws Exception {
+    runCommandForced(
+        "--email",
+        "user@example.test",
+        "--registry_lock_email_address",
+        "registrylockemail@otherexample.test");
+    assertThat(UserDao.loadUser("user@example.test").get().getRegistryLockEmailAddress())
+        .hasValue("registrylockemail@otherexample.test");
+  }
+
   @Test
   void testSuccess_admin() throws Exception {
     runCommandForced("--email", "user@example.test", "--admin", "true");
@@ -101,4 +112,29 @@ public class CreateUserCommandTest extends CommandTestCase<CreateUserCommand> {
         .isEqualTo("A user with email user@example.test already exists");
     verifyNoMoreInteractions(iamClient);
   }
+
+  @Test
+  void testFailure_badEmail() throws Exception {
+    assertThat(
+            assertThrows(
+                IllegalArgumentException.class,
+                () -> runCommandForced("--email", "this is not valid")))
+        .hasMessageThat()
+        .isEqualTo("Provided email this is not valid is not a valid email address");
+  }
+
+  @Test
+  void testFailure_badRegistryLockEmail() throws Exception {
+    assertThat(
+            assertThrows(
+                IllegalArgumentException.class,
+                () ->
+                    runCommandForced(
+                        "--email",
+                        "user@example.test",
+                        "--registry_lock_email_address",
+                        "this is not valid")))
+        .hasMessageThat()
+        .isEqualTo("Provided email this is not valid is not a valid email address");
+  }
 }

core/src/test/java/google/registry/tools/DomainLockUtilsTest.java

@@ -124,7 +124,7 @@ public final class DomainLockUtilsTest {
     clock.advanceBy(standardDays(1));
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", POC_ID, false);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false);
     verifyProperlyLockedDomain(false);
   }
 
@@ -137,7 +137,7 @@ public final class DomainLockUtilsTest {
     RegistryLock unlockRequest =
         domainLockUtils.saveNewRegistryUnlockRequest(
             DOMAIN_NAME, "TheRegistrar", false, Optional.empty());
-    domainLockUtils.verifyAndApplyUnlock(unlockRequest.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(unlockRequest.getVerificationCode(), false);
     assertThat(loadByEntity(domain).getStatusValues()).containsNoneIn(REGISTRY_LOCK_STATUSES);
   }
 
@@ -145,7 +145,7 @@ public final class DomainLockUtilsTest {
   void testSuccess_applyLockDomain() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", POC_ID, false);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false);
     verifyProperlyLockedDomain(false);
   }
 
@@ -155,7 +155,7 @@ public final class DomainLockUtilsTest {
     RegistryLock unlock =
         domainLockUtils.saveNewRegistryUnlockRequest(
             DOMAIN_NAME, "TheRegistrar", false, Optional.empty());
-    domainLockUtils.verifyAndApplyUnlock(unlock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(unlock.getVerificationCode(), false);
     verifyProperlyUnlockedDomain(false);
   }
 
@@ -163,7 +163,7 @@ public final class DomainLockUtilsTest {
   void testSuccess_applyAdminLock_onlyHistoryEntry() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", null, true);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), true);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), true);
     verifyProperlyLockedDomain(true);
   }
 
@@ -171,11 +171,11 @@ public final class DomainLockUtilsTest {
   void testSuccess_applyAdminUnlock_onlyHistoryEntry() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", null, true);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), true);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), true);
     RegistryLock unlock =
         domainLockUtils.saveNewRegistryUnlockRequest(
             DOMAIN_NAME, "TheRegistrar", true, Optional.empty());
-    domainLockUtils.verifyAndApplyUnlock(unlock.getVerificationCode(), true);
+    domainLockUtils.verifyVerificationCode(unlock.getVerificationCode(), true);
     verifyProperlyUnlockedDomain(true);
   }
 
@@ -196,7 +196,7 @@ public final class DomainLockUtilsTest {
   void testSuccess_administrativelyUnlock_nonAdmin() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", POC_ID, false);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false);
     domainLockUtils.administrativelyApplyUnlock(
         DOMAIN_NAME, "TheRegistrar", false, Optional.empty());
     verifyProperlyUnlockedDomain(false);
@@ -206,7 +206,7 @@ public final class DomainLockUtilsTest {
   void testSuccess_administrativelyUnlock_admin() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", null, true);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), true);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), true);
     domainLockUtils.administrativelyApplyUnlock(
         DOMAIN_NAME, "TheRegistrar", true, Optional.empty());
     verifyProperlyUnlockedDomain(true);
@@ -220,7 +220,7 @@ public final class DomainLockUtilsTest {
             DOMAIN_NAME, "TheRegistrar", false, Optional.empty());
     RegistryLock newLock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", POC_ID, false);
-    newLock = domainLockUtils.verifyAndApplyLock(newLock.getVerificationCode(), false);
+    newLock = domainLockUtils.verifyVerificationCode(newLock.getVerificationCode(), false);
     assertThat(
             getRegistryLockByRevisionId(oldLock.getRevisionId()).get().getRelock().getRevisionId())
         .isEqualTo(newLock.getRevisionId());
@@ -254,7 +254,7 @@ public final class DomainLockUtilsTest {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryUnlockRequest(
             DOMAIN_NAME, "TheRegistrar", false, Optional.of(standardHours(6)));
-    domainLockUtils.verifyAndApplyUnlock(lock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false);
     cloudTasksHelper.assertTasksEnqueued(
         QUEUE_ASYNC_ACTIONS,
         new TaskMatcher()
@@ -304,7 +304,7 @@ public final class DomainLockUtilsTest {
   void testFailure_createUnlock_alreadyPendingUnlock() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", POC_ID, false);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false);
     domainLockUtils.saveNewRegistryUnlockRequest(
         DOMAIN_NAME, "TheRegistrar", false, Optional.empty());
 
@@ -323,7 +323,7 @@ public final class DomainLockUtilsTest {
   void testFailure_createUnlock_nonAdminUnlockingAdmin() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", null, true);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), true);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), true);
     IllegalArgumentException thrown =
         assertThrows(
             IllegalArgumentException.class,
@@ -387,13 +387,15 @@ public final class DomainLockUtilsTest {
   void testFailure_applyLock_alreadyApplied() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", POC_ID, false);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false);
     domain = loadByEntity(domain);
     IllegalArgumentException thrown =
         assertThrows(
             IllegalArgumentException.class,
-            () -> domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), false));
-    assertThat(thrown).hasMessageThat().isEqualTo("Domain example.tld is already locked");
+            () -> domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false));
+    assertThat(thrown)
+        .hasMessageThat()
+        .isEqualTo("Lock/unlock with code 123456789ABCDEFGHJKLMNPQRSTUVWXY is already completed");
     assertNoDomainChanges();
   }
 
@@ -405,7 +407,7 @@ public final class DomainLockUtilsTest {
     IllegalArgumentException thrown =
         assertThrows(
             IllegalArgumentException.class,
-            () -> domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), true));
+            () -> domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), true));
     assertThat(thrown).hasMessageThat().isEqualTo("The pending lock has expired; please try again");
     assertNoDomainChanges();
   }
@@ -417,7 +419,7 @@ public final class DomainLockUtilsTest {
     IllegalArgumentException thrown =
         assertThrows(
             IllegalArgumentException.class,
-            () -> domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), false));
+            () -> domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false));
     assertThat(thrown).hasMessageThat().isEqualTo("Non-admin user cannot complete admin lock");
     assertNoDomainChanges();
   }
@@ -426,17 +428,19 @@ public final class DomainLockUtilsTest {
   void testFailure_applyUnlock_alreadyUnlocked() {
     RegistryLock lock =
         domainLockUtils.saveNewRegistryLockRequest(DOMAIN_NAME, "TheRegistrar", POC_ID, false);
-    domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), false);
     RegistryLock unlock =
         domainLockUtils.saveNewRegistryUnlockRequest(
             DOMAIN_NAME, "TheRegistrar", false, Optional.empty());
-    domainLockUtils.verifyAndApplyUnlock(unlock.getVerificationCode(), false);
+    domainLockUtils.verifyVerificationCode(unlock.getVerificationCode(), false);
 
     IllegalArgumentException thrown =
         assertThrows(
             IllegalArgumentException.class,
-            () -> domainLockUtils.verifyAndApplyUnlock(unlock.getVerificationCode(), false));
-    assertThat(thrown).hasMessageThat().isEqualTo("Domain example.tld is already unlocked");
+            () -> domainLockUtils.verifyVerificationCode(unlock.getVerificationCode(), false));
+    assertThat(thrown)
+        .hasMessageThat()
+        .isEqualTo("Lock/unlock with code Zabcdefghijkmnopqrstuvwxyz123456 is already completed");
     assertNoDomainChanges();
   }
 
@@ -451,7 +455,7 @@ public final class DomainLockUtilsTest {
     IllegalArgumentException thrown =
         assertThrows(
             IllegalArgumentException.class,
-            () -> domainLockUtils.verifyAndApplyLock(verificationCode, false));
+            () -> domainLockUtils.verifyVerificationCode(verificationCode, false));
     assertThat(thrown).hasMessageThat().isEqualTo("Domain example.tld is already locked");
 
     // Failure during the lock acquisition portion shouldn't affect the SQL object

core/src/test/java/google/registry/tools/GetTldCommandTest.java

@@ -50,7 +50,6 @@ class GetTldCommandTest extends CommandTestCase<GetTldCommand> {
         tld.asBuilder()
             .setDnsAPlusAaaaTtl(Duration.standardMinutes(15))
             .setDriveFolderId("driveFolder")
-            .setCreateBillingCost(Money.of(USD, 25))
             .setCreateBillingCostTransitions(
                 ImmutableSortedMap.of(
                     START_OF_TIME,

core/src/test/java/google/registry/tools/GetUserCommandTest.java

@@ -0,0 +1,138 @@
+// Copyright 2024 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.tools;
+
+import com.google.common.collect.ImmutableMap;
+import google.registry.model.console.GlobalRole;
+import google.registry.model.console.RegistrarRole;
+import google.registry.model.console.User;
+import google.registry.model.console.UserDao;
+import google.registry.model.console.UserRoles;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/** Tests for {@link GetUserCommand}. */
+public class GetUserCommandTest extends CommandTestCase<GetUserCommand> {
+
+  @BeforeEach
+  void beforeEach() {
+    UserDao.saveUser(
+        new User.Builder()
+            .setEmailAddress("johndoe@theregistrar.com")
+            .setUserRoles(
+                new UserRoles.Builder()
+                    .setRegistrarRoles(
+                        ImmutableMap.of("TheRegistrar", RegistrarRole.PRIMARY_CONTACT))
+                    .build())
+            .build());
+    UserDao.saveUser(
+        new User.Builder()
+            .setEmailAddress("fte@google.com")
+            .setUserRoles(
+                new UserRoles.Builder().setIsAdmin(true).setGlobalRole(GlobalRole.FTE).build())
+            .build());
+  }
+
+  @Test
+  void testSuccess() throws Exception {
+    runCommand("fte@google.com");
+    assertStdoutIs(
+        """
+        User: {
+            emailAddress=fte@google.com
+            id=2
+            registryLockEmailAddress=null
+            registryLockPasswordHash=null
+            registryLockPasswordSalt=null
+            updateTimestamp=UpdateAutoTimestamp: {
+                lastUpdateTime=2022-09-01T00:00:00.000Z
+            }
+            userRoles=UserRoles: {
+                globalRole=FTE
+                isAdmin=true
+                registrarRoles={}
+            }
+        }
+        """);
+  }
+
+  @Test
+  void testSuccess_multipleUsers() throws Exception {
+    runCommand("johndoe@theregistrar.com", "fte@google.com");
+    assertStdoutIs(
+        """
+        User: {
+            emailAddress=johndoe@theregistrar.com
+            id=1
+            registryLockEmailAddress=null
+            registryLockPasswordHash=null
+            registryLockPasswordSalt=null
+            updateTimestamp=UpdateAutoTimestamp: {
+                lastUpdateTime=2022-09-01T00:00:00.000Z
+            }
+            userRoles=UserRoles: {
+                globalRole=NONE
+                isAdmin=false
+                registrarRoles={TheRegistrar=PRIMARY_CONTACT}
+            }
+        }
+        User: {
+            emailAddress=fte@google.com
+            id=2
+            registryLockEmailAddress=null
+            registryLockPasswordHash=null
+            registryLockPasswordSalt=null
+            updateTimestamp=UpdateAutoTimestamp: {
+                lastUpdateTime=2022-09-01T00:00:00.000Z
+            }
+            userRoles=UserRoles: {
+                globalRole=FTE
+                isAdmin=true
+                registrarRoles={}
+            }
+        }
+        """);
+  }
+
+  @Test
+  void testPartialSuccess_partiallyUnknown() throws Exception {
+    runCommand("johndoe@theregistrar.com", "asdf@asdf.com");
+    assertStdoutIs(
+        """
+        User: {
+            emailAddress=johndoe@theregistrar.com
+            id=1
+            registryLockEmailAddress=null
+            registryLockPasswordHash=null
+            registryLockPasswordSalt=null
+            updateTimestamp=UpdateAutoTimestamp: {
+                lastUpdateTime=2022-09-01T00:00:00.000Z
+            }
+            userRoles=UserRoles: {
+                globalRole=NONE
+                isAdmin=false
+                registrarRoles={TheRegistrar=PRIMARY_CONTACT}
+            }
+        }
+        No user with email address asdf@asdf.com
+        """);
+  }
+
+  @Test
+  void testFailure_unknownUser() throws Exception {
+    runCommand("asdf@asdf.com");
+    assertStdoutIs("No user with email address asdf@asdf.com\n");
+  }
+}

core/src/test/java/google/registry/tools/UnlockDomainCommandTest.java

@@ -60,7 +60,7 @@ class UnlockDomainCommandTest extends CommandTestCase<UnlockDomainCommand> {
     Domain domain = persistResource(DatabaseHelper.newDomain(domainName));
     RegistryLock lock =
         command.domainLockUtils.saveNewRegistryLockRequest(domainName, registrarId, null, true);
-    command.domainLockUtils.verifyAndApplyLock(lock.getVerificationCode(), true);
+    command.domainLockUtils.verifyVerificationCode(lock.getVerificationCode(), true);
     return reloadResource(domain);
   }
 

core/src/test/java/google/registry/tools/UpdateUserCommandTest.java

@@ -38,6 +38,29 @@ public class UpdateUserCommandTest extends CommandTestCase<UpdateUserCommand> {
             .build());
   }
 
+  @Test
+  void testSuccess_registryLockEmail() throws Exception {
+    runCommandForced(
+        "--email",
+        "user@example.test",
+        "--registry_lock_email_address",
+        "registrylockemail@otherexample.test");
+    assertThat(UserDao.loadUser("user@example.test").get().getRegistryLockEmailAddress())
+        .hasValue("registrylockemail@otherexample.test");
+  }
+
+  @Test
+  void testSuccess_removeRegistryLockEmail() throws Exception {
+    UserDao.saveUser(
+        UserDao.loadUser("user@example.test")
+            .get()
+            .asBuilder()
+            .setRegistryLockEmailAddress("registrylock@otherexample.test")
+            .build());
+    runCommandForced("--email", "user@example.test", "--registry_lock_email_address", "");
+    assertThat(UserDao.loadUser("user@example.test").get().getRegistryLockEmailAddress()).isEmpty();
+  }
+
   @Test
   void testSuccess_admin() throws Exception {
     assertThat(UserDao.loadUser("user@example.test").get().getUserRoles().isAdmin()).isFalse();
@@ -86,4 +109,19 @@ public class UpdateUserCommandTest extends CommandTestCase<UpdateUserCommand> {
         .hasMessageThat()
         .isEqualTo("User nonexistent@example.test not found");
   }
+
+  @Test
+  void testFailure_badRegistryLockEmail() {
+    assertThat(
+            assertThrows(
+                IllegalArgumentException.class,
+                () ->
+                    runCommandForced(
+                        "--email",
+                        "user@example.test",
+                        "--registry_lock_email_address",
+                        "this is not valid")))
+        .hasMessageThat()
+        .isEqualTo("Provided email this is not valid is not a valid email address");
+  }
 }

core/src/test/java/google/registry/ui/server/console/ConsoleEppPasswordActionTest.java

@@ -20,13 +20,13 @@ import static google.registry.testing.DatabaseHelper.loadRegistrar;
 import static google.registry.testing.DatabaseHelper.persistNewRegistrar;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.api.client.http.HttpStatusCodes;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.gson.Gson;
 import google.registry.flows.PasswordOnlyTransportCredentials;
@@ -37,14 +37,20 @@ import google.registry.model.console.UserRoles;
 import google.registry.model.registrar.Registrar;
 import google.registry.persistence.transaction.JpaTestExtensions;
 import google.registry.request.Action;
+import google.registry.request.RequestModule;
 import google.registry.request.auth.AuthResult;
 import google.registry.request.auth.AuthenticatedRegistrarAccessor;
 import google.registry.request.auth.UserAuthInfo;
 import google.registry.testing.FakeConsoleApiParams;
 import google.registry.testing.FakeResponse;
 import google.registry.tools.GsonUtils;
+import google.registry.ui.server.console.ConsoleEppPasswordAction.EppPasswordData;
 import google.registry.ui.server.registrar.ConsoleApiParams;
+import google.registry.ui.server.registrar.RegistrarConsoleModule;
 import google.registry.util.EmailMessage;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
 import java.util.Optional;
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
@@ -54,6 +60,9 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 class ConsoleEppPasswordActionTest {
   private static final Gson GSON = GsonUtils.provideGson();
+  private static String eppPostData =
+      "{\"registrarId\":\"%s\",\"oldPassword\":\"%s\",\"newPassword\":\"%s\",\"newPasswordRepeat\":\"%s\"}";
+
   private ConsoleApiParams consoleApiParams;
   protected PasswordOnlyTransportCredentials credentials = new PasswordOnlyTransportCredentials();
   private FakeResponse response;
@@ -78,28 +87,19 @@ class ConsoleEppPasswordActionTest {
   }
 
   @Test
-  void testFailure_emptyParams() {
-    ConsoleEppPasswordAction action = createAction();
+  void testFailure_emptyParams() throws IOException {
+    ConsoleEppPasswordAction action = createAction("", "", "", "");
     action.run();
     assertThat(((FakeResponse) consoleApiParams.response()).getStatus())
         .isEqualTo(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
     assertThat(((FakeResponse) consoleApiParams.response()).getPayload())
-        .isEqualTo("Missing parameter: registrarId");
+        .isEqualTo("Missing param(s): registrarId");
   }
 
   @Test
-  void testFailure_passwordsDontMatch() {
-    ConsoleEppPasswordAction action = createAction();
-    setParams(
-        ImmutableMap.of(
-            "registrarId",
-            "registrarId",
-            "oldPassword",
-            "oldPassword",
-            "newPassword",
-            "newPassword",
-            "newPasswordRepeat",
-            "newPasswordRepeat"));
+  void testFailure_passwordsDontMatch() throws IOException {
+    ConsoleEppPasswordAction action =
+        createAction("registrarId", "oldPassword", "newPassword", "newPasswordRepeat");
     action.run();
     assertThat(((FakeResponse) consoleApiParams.response()).getStatus())
         .isEqualTo(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
@@ -108,18 +108,9 @@ class ConsoleEppPasswordActionTest {
   }
 
   @Test
-  void testFailure_existingPasswordIncorrect() {
-    ConsoleEppPasswordAction action = createAction();
-    setParams(
-        ImmutableMap.of(
-            "registrarId",
-            "registrarId",
-            "oldPassword",
-            "oldPassword",
-            "newPassword",
-            "randomPasword",
-            "newPasswordRepeat",
-            "randomPasword"));
+  void testFailure_existingPasswordIncorrect() throws IOException {
+    ConsoleEppPasswordAction action =
+        createAction("registrarId", "oldPassword", "randomPasword", "randomPasword");
     action.run();
     assertThat(((FakeResponse) consoleApiParams.response()).getStatus())
         .isEqualTo(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
@@ -128,18 +119,9 @@ class ConsoleEppPasswordActionTest {
   }
 
   @Test
-  void testSuccess_sendsConfirmationEmail() throws AddressException {
-    ConsoleEppPasswordAction action = createAction();
-    setParams(
-        ImmutableMap.of(
-            "registrarId",
-            "registrarId",
-            "oldPassword",
-            "foobar",
-            "newPassword",
-            "randomPassword",
-            "newPasswordRepeat",
-            "randomPassword"));
+  void testSuccess_sendsConfirmationEmail() throws IOException, AddressException {
+    ConsoleEppPasswordAction action =
+        createAction("registrarId", "foobar", "randomPassword", "randomPassword");
     action.run();
     verify(gmailClient, times(1))
         .sendEmail(
@@ -153,18 +135,9 @@ class ConsoleEppPasswordActionTest {
   }
 
   @Test
-  void testSuccess_passwordUpdated() {
-    ConsoleEppPasswordAction action = createAction();
-    setParams(
-        ImmutableMap.of(
-            "registrarId",
-            "registrarId",
-            "oldPassword",
-            "foobar",
-            "newPassword",
-            "randomPassword",
-            "newPasswordRepeat",
-            "randomPassword"));
+  void testSuccess_passwordUpdated() throws IOException {
+    ConsoleEppPasswordAction action =
+        createAction("registrarId", "foobar", "randomPassword", "randomPassword");
     action.run();
     assertThat(((FakeResponse) consoleApiParams.response()).getStatus())
         .isEqualTo(HttpStatusCodes.STATUS_CODE_OK);
@@ -174,16 +147,9 @@ class ConsoleEppPasswordActionTest {
         });
   }
 
-  private void setParams(ImmutableMap<String, String> params) {
-    params.entrySet().stream()
-        .forEach(
-            entry -> {
-              when(consoleApiParams.request().getParameter(entry.getKey()))
-                  .thenReturn(entry.getValue());
-            });
-  }
-
-  private ConsoleEppPasswordAction createAction() {
+  private ConsoleEppPasswordAction createAction(
+      String registrarId, String oldPassword, String newPassword, String newPasswordRepeat)
+      throws IOException {
     response = new FakeResponse();
     User user =
         new User.Builder()
@@ -197,8 +163,18 @@ class ConsoleEppPasswordActionTest {
         AuthenticatedRegistrarAccessor.createForTesting(
             ImmutableSetMultimap.of("registrarId", OWNER));
     when(consoleApiParams.request().getMethod()).thenReturn(Action.Method.POST.toString());
+    doReturn(
+            new BufferedReader(
+                new StringReader(
+                    String.format(
+                        eppPostData, registrarId, oldPassword, newPassword, newPasswordRepeat))))
+        .when(consoleApiParams.request())
+        .getReader();
+    Optional<EppPasswordData> maybePasswordChangeRequest =
+        RegistrarConsoleModule.provideEppPasswordChangeRequest(
+            GSON, RequestModule.provideJsonBody(consoleApiParams.request(), GSON));
 
     return new ConsoleEppPasswordAction(
-        consoleApiParams, authenticatedRegistrarAccessor, gmailClient);
+        consoleApiParams, authenticatedRegistrarAccessor, gmailClient, maybePasswordChangeRequest);
   }
 }

core/src/test/java/google/registry/ui/server/console/ConsoleRegistryLockActionTest.java

@@ -73,11 +73,13 @@ import org.mockito.quality.Strictness;
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class ConsoleRegistryLockActionTest {
 
-  private static final String EMAIL_MESSAGE_TEMPLATE =
-      "Please click the link below to perform the lock \\/ unlock action on domain example.test."
-          + " Note: this code will expire in one hour.\n\n"
-          + "https:\\/\\/registrarconsole.tld\\/console-api\\/registry-lock-verify\\?lockVerificationCode="
-          + "[0-9a-zA-Z_\\-]+&isLock=(true|false)";
+  private static final String EXPECTED_EMAIL_MESSAGE =
+      """
+      Please click the link below to perform the lock / unlock action on domain example.test. \
+      Note: this code will expire in one hour.
+
+      https://registrarconsole.tld/console-api/registry-lock-verify?lockVerificationCode=\
+      123456789ABCDEFGHJKLMNPQRSTUVWXY""";
 
   private static final Gson GSON = RequestModule.provideGson();
 
@@ -100,6 +102,7 @@ public class ConsoleRegistryLockActionTest {
     user =
         new User.Builder()
             .setEmailAddress("user@theregistrar.com")
+            .setRegistryLockEmailAddress("registrylock@theregistrar.com")
             .setUserRoles(
                 new UserRoles.Builder()
                     .setRegistrarRoles(
@@ -436,6 +439,15 @@ public class ConsoleRegistryLockActionTest {
         .isEqualTo("Registry lock not allowed for registrar TheRegistrar");
   }
 
+  @Test
+  void testPost_failure_noRegistryLockEmail() {
+    user = user.asBuilder().setRegistryLockEmailAddress(null).build();
+    action = createDefaultPostAction(true);
+    action.run();
+    assertThat(response.getStatus()).isEqualTo(HttpStatusCodes.STATUS_CODE_BAD_REQUEST);
+    assertThat(response.getPayload()).isEqualTo("User has no registry lock email address");
+  }
+
   @Test
   void testPost_failure_badPassword() throws Exception {
     action = createPostAction("example.test", true, "badPassword", Optional.empty());
@@ -532,8 +544,8 @@ public class ConsoleRegistryLockActionTest {
     verify(gmailClient).sendEmail(emailCaptor.capture());
     EmailMessage sentMessage = emailCaptor.getValue();
     assertThat(sentMessage.subject()).matches("Registry (un)?lock verification");
-    assertThat(sentMessage.body()).matches(EMAIL_MESSAGE_TEMPLATE);
+    assertThat(sentMessage.body()).isEqualTo(EXPECTED_EMAIL_MESSAGE);
     assertThat(sentMessage.recipients())
-        .containsExactly(new InternetAddress("user@theregistrar.com"));
+        .containsExactly(new InternetAddress("registrylock@theregistrar.com"));
   }
 }

core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java

@@ -99,10 +99,15 @@ class RegistrarsActionTest {
       new JpaTestExtensions.Builder().buildIntegrationTestExtension();
 
   @Test
-  void testSuccess_onlyRealRegistrars() {
+  void testSuccess_onlyRealAndOteRegistrars() {
     Registrar registrar = persistNewRegistrar("registrarId");
     registrar = registrar.asBuilder().setType(Registrar.Type.TEST).setIanaIdentifier(null).build();
     persistResource(registrar);
+
+    registrar = persistNewRegistrar("registrarId2");
+    registrar = registrar.asBuilder().setType(Registrar.Type.OTE).setIanaIdentifier(null).build();
+    persistResource(registrar);
+
     RegistrarsAction action =
         createAction(
             Action.Method.GET,
@@ -114,11 +119,13 @@ class RegistrarsActionTest {
     assertThat(((FakeResponse) consoleApiParams.response()).getStatus())
         .isEqualTo(HttpStatusCodes.STATUS_CODE_OK);
     String payload = ((FakeResponse) consoleApiParams.response()).getPayload();
-    assertThat(
-            ImmutableList.of("\"registrarId\":\"NewRegistrar\"", "\"registrarId\":\"TheRegistrar\"")
-                .stream()
-                .allMatch(s -> payload.contains(s)))
-        .isTrue();
+
+    var actualRegistrarIds =
+        ImmutableList.copyOf(GSON.fromJson(payload, Registrar[].class)).stream()
+            .map(r -> r.getRegistrarId())
+            .collect(Collectors.toList());
+
+    assertThat(actualRegistrarIds).containsExactly("NewRegistrar", "TheRegistrar", "registrarId2");
   }
 
   @Test

core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java

@@ -77,11 +77,13 @@ import org.mockito.quality.Strictness;
 @MockitoSettings(strictness = Strictness.LENIENT)
 final class RegistryLockPostActionTest {
 
-  private static final String EMAIL_MESSAGE_TEMPLATE =
-      "Please click the link below to perform the lock \\/ unlock action on domain example.tld. "
-          + "Note: this code will expire in one hour.\n\n"
-          + "https:\\/\\/registrarconsole.tld\\/registry-lock-verify\\?lockVerificationCode="
-          + "[0-9a-zA-Z_\\-]+&isLock=(true|false)";
+  private static final String EXPECTED_EMAIL_MESSAGE =
+      """
+      Please click the link below to perform the lock / unlock action on domain example.tld. Note: \
+      this code will expire in one hour.
+
+      https://registrarconsole.tld/registry-lock-verify?lockVerificationCode=\
+      123456789ABCDEFGHJKLMNPQRSTUVWXY""";
 
   private final FakeClock clock = new FakeClock();
 
@@ -218,6 +220,7 @@ final class RegistryLockPostActionTest {
     google.registry.model.console.User consoleUser =
         new google.registry.model.console.User.Builder()
             .setEmailAddress("johndoe@theregistrar.com")
+            .setRegistryLockEmailAddress("johndoe.registrylock@theregistrar.com")
             .setUserRoles(
                 new UserRoles.Builder()
                     .setRegistrarRoles(
@@ -229,7 +232,7 @@ final class RegistryLockPostActionTest {
     AuthResult consoleAuthResult = AuthResult.createUser(UserAuthInfo.create(consoleUser));
     action = createAction(consoleAuthResult);
     Map<String, ?> response = action.handleJsonRequest(lockRequest());
-    assertSuccess(response, "lock", "johndoe@theregistrar.com");
+    assertSuccess(response, "lock", "johndoe.registrylock@theregistrar.com");
   }
 
   @Test
@@ -497,7 +500,7 @@ final class RegistryLockPostActionTest {
     verify(gmailClient).sendEmail(emailCaptor.capture());
     EmailMessage sentMessage = emailCaptor.getValue();
     assertThat(sentMessage.subject()).matches("Registry (un)?lock verification");
-    assertThat(sentMessage.body()).matches(EMAIL_MESSAGE_TEMPLATE);
+    assertThat(sentMessage.body()).isEqualTo(EXPECTED_EMAIL_MESSAGE);
     assertThat(sentMessage.recipients()).containsExactly(new InternetAddress(recipient));
   }
 

core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java

@@ -92,7 +92,7 @@ final class RegistryLockVerifyActionTest {
     Host host = persistActiveHost("ns1.example.net");
     domain = persistResource(DatabaseHelper.newDomain("example.tld", host));
     when(request.getRequestURI()).thenReturn("https://registry.example/registry-lock-verification");
-    action = createAction(lockId, true);
+    action = createAction(lockId);
   }
 
   @Test
@@ -113,9 +113,14 @@ final class RegistryLockVerifyActionTest {
 
   @Test
   void testSuccess_unlockDomain() {
-    action = createAction(lockId, false);
+    action = createAction(lockId);
     domain = persistResource(domain.asBuilder().setStatusValues(REGISTRY_LOCK_STATUSES).build());
-    saveRegistryLock(createLock().asBuilder().setUnlockRequestTime(fakeClock.nowUtc()).build());
+    saveRegistryLock(
+        createLock()
+            .asBuilder()
+            .setLockCompletionTime(fakeClock.nowUtc())
+            .setUnlockRequestTime(fakeClock.nowUtc())
+            .build());
     action.run();
     assertThat(response.getStatus()).isEqualTo(SC_OK);
     assertThat(response.getPayload()).contains("Success: unlock has been applied to example.tld");
@@ -154,7 +159,8 @@ final class RegistryLockVerifyActionTest {
   void testFailure_alreadyVerified() {
     saveRegistryLock(createLock().asBuilder().setLockCompletionTime(fakeClock.nowUtc()).build());
     action.run();
-    assertThat(response.getPayload()).contains("Failed: Domain example.tld is already locked");
+    assertThat(response.getPayload())
+        .contains("Lock/unlock with code 123456789ABCDEFGHJKLMNPQRSTUVWXY is already completed");
     assertNoDomainChanges();
   }
 
@@ -178,7 +184,7 @@ final class RegistryLockVerifyActionTest {
 
   @Test
   void testFailure_alreadyUnlocked() {
-    action = createAction(lockId, false);
+    action = createAction(lockId);
     saveRegistryLock(
         createLock()
             .asBuilder()
@@ -187,7 +193,8 @@ final class RegistryLockVerifyActionTest {
             .setUnlockCompletionTime(fakeClock.nowUtc())
             .build());
     action.run();
-    assertThat(response.getPayload()).contains("Failed: Domain example.tld is already unlocked");
+    assertThat(response.getPayload())
+        .contains("Lock/unlock with code 123456789ABCDEFGHJKLMNPQRSTUVWXY is already completed");
     assertNoDomainChanges();
   }
 
@@ -228,27 +235,6 @@ final class RegistryLockVerifyActionTest {
     assertThat(afterAction).isEqualTo(lock);
   }
 
-  @Test
-  void testFailure_isLockTrue_shouldBeFalse() {
-    domain = persistResource(domain.asBuilder().setStatusValues(REGISTRY_LOCK_STATUSES).build());
-    saveRegistryLock(
-        createLock()
-            .asBuilder()
-            .setLockCompletionTime(fakeClock.nowUtc())
-            .setUnlockRequestTime(fakeClock.nowUtc())
-            .build());
-    action.run();
-    assertThat(response.getPayload()).contains("Failed: Domain example.tld is already locked");
-  }
-
-  @Test
-  void testFailure_isLockFalse_shouldBeTrue() {
-    action = createAction(lockId, false);
-    saveRegistryLock(createLock());
-    action.run();
-    assertThat(response.getPayload()).contains("Failed: Domain example.tld is already unlocked");
-  }
-
   @Test
   void testFailure_lock_unlock_lockAgain() {
     RegistryLock lock = saveRegistryLock(createLock());
@@ -256,14 +242,15 @@ final class RegistryLockVerifyActionTest {
     assertThat(response.getPayload()).contains("Success: lock has been applied to example.tld");
     String unlockVerificationCode = "some-unlock-code";
     saveRegistryLock(
-        lock.asBuilder()
+        loadByEntity(lock)
+            .asBuilder()
             .setVerificationCode(unlockVerificationCode)
             .setUnlockRequestTime(fakeClock.nowUtc())
             .build());
-    action = createAction(unlockVerificationCode, false);
+    action = createAction(unlockVerificationCode);
     action.run();
     assertThat(response.getPayload()).contains("Success: unlock has been applied to example.tld");
-    action = createAction(lockId, true);
+    action = createAction(lockId);
     action.run();
     assertThat(response.getPayload()).contains("Failed: Invalid verification code");
   }
@@ -273,22 +260,29 @@ final class RegistryLockVerifyActionTest {
     saveRegistryLock(createLock());
     action.run();
     assertThat(response.getPayload()).contains("Success: lock has been applied to example.tld");
-    action = createAction(lockId, true);
+    action = createAction(lockId);
     action.run();
-    assertThat(response.getPayload()).contains("Failed: Domain example.tld is already locked");
+    assertThat(response.getPayload())
+        .contains("Lock/unlock with code 123456789ABCDEFGHJKLMNPQRSTUVWXY is already completed");
   }
 
   @Test
   void testFailure_unlock_unlockAgain() {
-    action = createAction(lockId, false);
+    action = createAction(lockId);
     domain = persistResource(domain.asBuilder().setStatusValues(REGISTRY_LOCK_STATUSES).build());
-    saveRegistryLock(createLock().asBuilder().setUnlockRequestTime(fakeClock.nowUtc()).build());
+    saveRegistryLock(
+        createLock()
+            .asBuilder()
+            .setLockCompletionTime(fakeClock.nowUtc())
+            .setUnlockRequestTime(fakeClock.nowUtc())
+            .build());
     action.run();
     assertThat(response.getStatus()).isEqualTo(SC_OK);
     assertThat(response.getPayload()).contains("Success: unlock has been applied to example.tld");
-    action = createAction(lockId, false);
+    action = createAction(lockId);
     action.run();
-    assertThat(response.getPayload()).contains("Failed: Domain example.tld is already unlocked");
+    assertThat(response.getPayload())
+        .contains("Lock/unlock with code 123456789ABCDEFGHJKLMNPQRSTUVWXY is already completed");
   }
 
   private RegistryLock createLock() {
@@ -323,14 +317,13 @@ final class RegistryLockVerifyActionTest {
             .build());
   }
 
-  private RegistryLockVerifyAction createAction(String lockVerificationCode, Boolean isLock) {
+  private RegistryLockVerifyAction createAction(String lockVerificationCode) {
     response = new FakeResponse();
     RegistryLockVerifyAction action =
         new RegistryLockVerifyAction(
             new DomainLockUtils(
                 stringGenerator, "adminreg", cloudTasksHelper.getTestCloudTasksUtils()),
-            lockVerificationCode,
-            isLock);
+            lockVerificationCode);
     authResult = AuthResult.createUser(UserAuthInfo.create(user, false));
     action.req = request;
     action.response = response;

core/src/test/resources/google/registry/tools/costmap.yaml

@@ -1,72 +0,0 @@
-addGracePeriodLength: "PT432000S"
-allowedFullyQualifiedHostNames:
-- "foo"
-allowedRegistrantContactIds: []
-anchorTenantAddGracePeriodLength: "PT2592000S"
-autoRenewGracePeriodLength: "PT3888000S"
-automaticTransferLength: "PT432000S"
-claimsPeriodEnd: "294247-01-10T04:00:54.775Z"
-createBillingCostTransitions:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 13.00
-  "1996-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 14.00
-  "2050-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 15.00
-creationTime: "1970-01-01T00:00:00.000Z"
-currency: "USD"
-defaultPromoTokens:
-- "bbbbb"
-dnsAPlusAaaaTtl: "PT3600S"
-dnsDsTtl: null
-dnsNsTtl: null
-dnsPaused: false
-dnsWriters:
-- "VoidDnsWriter"
-driveFolderId: null
-eapFeeSchedule:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 0.00
-  "2000-06-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 100.00
-  "2000-06-02T00:00:00.000Z":
-    currency: "USD"
-    amount: 0.00
-escrowEnabled: false
-idnTables:
-- "EXTENDED_LATIN"
-- "JA"
-invoicingEnabled: false
-lordnUsername: null
-numDnsPublishLocks: 1
-pendingDeleteLength: "PT432000S"
-premiumListName: "test"
-pricingEngineClassName: "google.registry.model.pricing.StaticPremiumListPricingEngine"
-redemptionGracePeriodLength: "PT2592000S"
-registryLockOrUnlockBillingCost:
-  currency: "USD"
-  amount: 0.00
-renewBillingCostTransitions:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 11.00
-renewGracePeriodLength: "PT432000S"
-reservedListNames: []
-restoreBillingCost:
-  currency: "USD"
-  amount: 17.00
-roidSuffix: "COSTMAP"
-serverStatusChangeBillingCost:
-  currency: "USD"
-  amount: 19.00
-tldStateTransitions:
-  "1970-01-01T00:00:00.000Z": "GENERAL_AVAILABILITY"
-tldStr: "costmap"
-tldType: "REAL"
-tldUnicode: "costmap"
-transferGracePeriodLength: "PT432000S"

core/src/test/resources/google/registry/tools/nocreatecostmap.yaml

@@ -1,56 +0,0 @@
-addGracePeriodLength: "PT432000S"
-allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
-anchorTenantAddGracePeriodLength: "PT2592000S"
-autoRenewGracePeriodLength: "PT3888000S"
-automaticTransferLength: "PT432000S"
-claimsPeriodEnd: "294247-01-10T04:00:54.775Z"
-createBillingCostTransitions:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 25.00
-creationTime: "2022-09-01T00:00:00.000Z"
-currency: "USD"
-defaultPromoTokens: []
-dnsAPlusAaaaTtl: "PT900S"
-dnsDsTtl: null
-dnsNsTtl: null
-dnsPaused: false
-dnsWriters:
-- "VoidDnsWriter"
-driveFolderId: "driveFolder"
-eapFeeSchedule:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 0.00
-escrowEnabled: false
-idnTables: []
-invoicingEnabled: false
-lordnUsername: null
-numDnsPublishLocks: 1
-pendingDeleteLength: "PT432000S"
-premiumListName: "test"
-pricingEngineClassName: "google.registry.model.pricing.StaticPremiumListPricingEngine"
-redemptionGracePeriodLength: "PT2592000S"
-registryLockOrUnlockBillingCost:
-  currency: "USD"
-  amount: 0.00
-renewBillingCostTransitions:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 11.00
-renewGracePeriodLength: "PT432000S"
-reservedListNames: []
-restoreBillingCost:
-  currency: "USD"
-  amount: 17.00
-roidSuffix: "NOCREATE"
-serverStatusChangeBillingCost:
-  currency: "USD"
-  amount: 19.00
-tldStateTransitions:
-  "1970-01-01T00:00:00.000Z": "GENERAL_AVAILABILITY"
-tldStr: "nocreatecostmap"
-tldType: "REAL"
-tldUnicode: "nocreatecostmap"
-transferGracePeriodLength: "PT432000S"

core/src/test/resources/google/registry/tools/withcreatecost.yaml

@@ -1,62 +0,0 @@
-addGracePeriodLength: "PT432000S"
-allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
-anchorTenantAddGracePeriodLength: "PT2592000S"
-autoRenewGracePeriodLength: "PT3888000S"
-automaticTransferLength: "PT432000S"
-claimsPeriodEnd: "294247-01-10T04:00:54.775Z"
-createBillingCost:
-  currency: "USD"
-  amount: 25.00
-createBillingCostTransitions:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 8.00
-  "2020-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 25.00
-creationTime: "2022-09-01T00:00:00.000Z"
-currency: "USD"
-defaultPromoTokens: []
-dnsAPlusAaaaTtl: "PT900S"
-dnsDsTtl: null
-dnsNsTtl: null
-dnsPaused: false
-dnsWriters:
-- "VoidDnsWriter"
-driveFolderId: "driveFolder"
-eapFeeSchedule:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 0.00
-escrowEnabled: false
-idnTables: []
-invoicingEnabled: false
-lordnUsername: null
-numDnsPublishLocks: 1
-pendingDeleteLength: "PT432000S"
-premiumListName: "test"
-pricingEngineClassName: "google.registry.model.pricing.StaticPremiumListPricingEngine"
-redemptionGracePeriodLength: "PT2592000S"
-registryLockOrUnlockBillingCost:
-  currency: "USD"
-  amount: 0.00
-renewBillingCostTransitions:
-  "1970-01-01T00:00:00.000Z":
-    currency: "USD"
-    amount: 11.00
-renewGracePeriodLength: "PT432000S"
-reservedListNames: []
-restoreBillingCost:
-  currency: "USD"
-  amount: 17.00
-roidSuffix: "TLD"
-serverStatusChangeBillingCost:
-  currency: "USD"
-  amount: 19.00
-tldStateTransitions:
-  "1970-01-01T00:00:00.000Z": "GENERAL_AVAILABILITY"
-tldStr: "withcreatecost"
-tldType: "REAL"
-tldUnicode: "withcreatecost"
-transferGracePeriodLength: "PT432000S"

db/gradle.lockfile

@@ -50,7 +50,7 @@ com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnno
 com.google.guava:guava:31.0.1-jre=checkstyle
 com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.guava:guava:33.1.0-android=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.guava:guava:33.1.0-jre=testCompileClasspath
+com.google.guava:guava:33.2.0-jre=testCompileClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-apache-v2:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-gson:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -91,8 +91,8 @@ org.checkerframework:checker-compat-qual:2.5.3=testCompileClasspath,testRuntimeC
 org.checkerframework:checker-qual:3.12.0=checkstyle
 org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor
 org.checkerframework:checker-qual:3.42.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-core:10.11.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-database-postgresql:10.11.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-core:10.13.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
 org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt
@@ -100,11 +100,11 @@ org.jacoco:org.jacoco.core:0.8.11=jacocoAnt
 org.jacoco:org.jacoco.report:0.8.11=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
 org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -119,9 +119,9 @@ org.reflections:reflections:0.10.2=checkstyle
 org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.36=testCompileClasspath
 org.slf4j:slf4j-api:2.0.13=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.testcontainers:database-commons:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:jdbc:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:junit-jupiter:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:postgresql:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:testcontainers:1.19.7=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:database-commons:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:jdbc:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:postgresql:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath
 empty=implementationApi,schema

db/src/main/resources/sql/er_diagram/brief_er_diagram.html

@@ -261,11 +261,11 @@ td.section {
     </tr>
     <tr>
      <td class="property_name">generated on</td>
-     <td class="property_value">2024-05-01 21:04:48.5296048</td>
+     <td class="property_value">2024-05-10 19:17:39.481284329</td>
     </tr>
     <tr>
      <td class="property_name">last flyway file</td>
-     <td id="lastFlywayFile" class="property_value">V170__user_update_registry_lock_email.sql</td>
+     <td id="lastFlywayFile" class="property_value">V171__drop_create_billing_cost_columns_from_tld.sql</td>
     </tr>
    </tbody>
   </table>
@@ -277,11 +277,11 @@ td.section {
      SchemaCrawler_Diagram
     </title>
     <polygon fill="white" stroke="transparent" points="-4,4 -4,-3493.5 4025,-3493.5 4025,4 -4,4" />
-    <text text-anchor="start" x="3745" y="-29.8" font-family="Helvetica,sans-Serif" font-size="14.00">generated by</text>
-    <text text-anchor="start" x="3828" y="-29.8" font-family="Helvetica,sans-Serif" font-size="14.00">SchemaCrawler 16.10.1</text>
-    <text text-anchor="start" x="3744" y="-10.8" font-family="Helvetica,sans-Serif" font-size="14.00">generated on</text>
-    <text text-anchor="start" x="3828" y="-10.8" font-family="Helvetica,sans-Serif" font-size="14.00">2024-05-01 21:04:48.5296048</text>
-    <polygon fill="none" stroke="#888888" points="3741,-4 3741,-44 4013,-44 4013,-4 3741,-4" /> <!-- allocationtoken_a08ccbef -->
+    <text text-anchor="start" x="3730.5" y="-29.8" font-family="Helvetica,sans-Serif" font-size="14.00">generated by</text>
+    <text text-anchor="start" x="3813.5" y="-29.8" font-family="Helvetica,sans-Serif" font-size="14.00">SchemaCrawler 16.10.1</text>
+    <text text-anchor="start" x="3729.5" y="-10.8" font-family="Helvetica,sans-Serif" font-size="14.00">generated on</text>
+    <text text-anchor="start" x="3813.5" y="-10.8" font-family="Helvetica,sans-Serif" font-size="14.00">2024-05-10 19:17:39.481284329</text>
+    <polygon fill="none" stroke="#888888" points="3726,-4 3726,-44 4013,-44 4013,-4 3726,-4" /> <!-- allocationtoken_a08ccbef -->
     <g id="node1" class="node">
      <title>
       allocationtoken_a08ccbef

db/src/main/resources/sql/flyway.txt

@@ -168,3 +168,4 @@ V167__creat_billing_cost_transitions_not_null.sql
 V168__registry_lock_email.sql
 V169__add_more_indexes_needed_for_delete_prober_data.sql
 V170__user_update_registry_lock_email.sql
+V171__drop_create_billing_cost_columns_from_tld.sql

db/src/main/resources/sql/flyway/V171__drop_create_billing_cost_columns_from_tld.sql

@@ -0,0 +1,16 @@
+-- Copyright 2024 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.
+
+alter table "Tld" drop column create_billing_cost_amount;
+alter table "Tld" drop column create_billing_cost_currency;

db/src/main/resources/sql/schema/db-schema.sql.generated

@@ -833,8 +833,6 @@
         breakglass_mode boolean not null,
         bsa_enroll_start_time timestamptz,
         claims_period_end timestamptz not null,
-        create_billing_cost_amount numeric(19, 2),
-        create_billing_cost_currency text,
         create_billing_cost_transitions hstore not null,
         creation_time timestamptz not null,
         currency text not null,
@@ -884,6 +882,7 @@
        id  bigserial not null,
         update_timestamp timestamptz,
         email_address text not null,
+        registry_lock_email_address text,
         registry_lock_password_hash text,
         registry_lock_password_salt text,
         global_role text not null,
@@ -901,6 +900,7 @@
         history_url text not null,
         user_id int8 not null,
         email_address text not null,
+        registry_lock_email_address text,
         registry_lock_password_hash text,
         registry_lock_password_salt text,
         global_role text not null,

db/src/main/resources/sql/schema/nomulus.golden.sql

@@ -1249,8 +1249,6 @@ CREATE TABLE public."Tld" (
     auto_renew_grace_period_length interval NOT NULL,
     automatic_transfer_length interval NOT NULL,
     claims_period_end timestamp with time zone NOT NULL,
-    create_billing_cost_amount numeric(19,2),
-    create_billing_cost_currency text,
     creation_time timestamp with time zone NOT NULL,
     currency text NOT NULL,
     dns_paused boolean NOT NULL,

jetty/Dockerfile

@@ -1,5 +1,6 @@
 FROM jetty:12-jdk21
 ADD --chown=jetty:jetty build/jetty-base /jetty-base
 ADD --chown=jetty:jetty start.sh /
+ADD --chown=jetty:jetty logging.properties /
 EXPOSE 8080
 ENTRYPOINT ["/bin/sh", "/start.sh"]

jetty/build.gradle

@@ -27,12 +27,17 @@ war {
     dependsOn(tasks.named('copyJettyBase'))
 }
 
+tasks.named('compileTestJava') {
+    // Gradle insists on this execution dependency.
+    dependsOn(tasks.named('copyJettyBase'))
+}
+
 dependencies {
     implementation project(':core')
 }
 
 tasks.register('copyConsole', Copy) {
-    from("${rootDir}/console-webapp/dist/console-webapp") {
+    from("${rootDir}/console-webapp/staged/dist") {
         include "**/*"
     }
     into layout.buildDirectory.dir('jetty-base/webapps/console')
@@ -56,6 +61,7 @@ tasks.register('tagNomulusImage', Exec) {
 
 tasks.register('pushNomulusImage', Exec) {
     commandLine 'docker', 'push', "gcr.io/${rootProject.gcpProject}/nomulus"
+    dependsOn(tasks.named('tagNomulusImage'))
 }
 
 tasks.register('run', JavaExec) {
@@ -72,11 +78,12 @@ tasks.register('run', JavaExec) {
     workingDir(layout.buildDirectory.dir('jetty-base'))
     classpath = files(jetty_home + '/start.jar')
     systemProperty('google.registry.environment', environment)
+    systemProperty('java.util.logging.config.file', "${projectDir}/logging.properties")
     dependsOn(tasks.named('stage'))
 }
 
 tasks.register('deployNomulus', Exec) {
-    dependsOn(tasks.named('pushNomulusImage'), tasks.named(":proxy:pushProxyImage"))
+    dependsOn('pushNomulusImage', ':proxy:pushProxyImage')
     configure verifyDeploymentConfig
     commandLine './deploy-nomulus-for-env.sh', "${rootProject.environment}"
 }

jetty/gradle.lockfile

@@ -29,71 +29,71 @@ com.github.jnr:jnr-unixsocket:0.38.22=deploy_jar,runtimeClasspath,testRuntimeCla
 com.github.jnr:jnr-x86asm:1.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:2.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:2.5.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:2.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:2.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:2.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:2.5.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.173.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.173.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:2.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.108.5=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.22=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-v1:6.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.176.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.109.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.13.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.62.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.62.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.62.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-common-protos:2.37.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.173.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.173.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigtable-v2:2.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.109.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-firestore-v1:3.16.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-monitoring-v3:3.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.108.5=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.12.22=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-v1:6.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-common-protos:2.39.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.176.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.176.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.110.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.20.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-monitoring-v3:3.39.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.109.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.62.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.62.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.62.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.62.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.131.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.131.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.37.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.32.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:api-common:2.29.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-admin-directory:directory_v1-rev20240304-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-appengine:v1-rev20240226-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-bigquery:v2-rev20240124-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240128-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-dataflow:v1b3-rev20240113-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.133.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.133.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.39.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.34.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:api-common:2.31.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-gmail:v1-rev20231218-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-gmail:v1-rev20240422-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-iam:v2-rev20240314-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-monitoring:v3-rev20240414-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-monitoring:v3-rev20240427-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-sheets:v4-rev20240402-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-sheets:v4-rev20240423-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20240324-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-storage:v1-rev20240205-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-storage:v1-rev20240311-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-stubs:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-remote-api:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-tools-sdk:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -105,25 +105,25 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationP
 com.google.cloud.bigdataoss:gcsio:2.2.16=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud.bigdataoss:util:2.2.16=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud.bigtable:bigtable-client-core-config:1.28.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud.datastore:datastore-v1-proto-client:2.18.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud.datastore:datastore-v1-proto-client:2.19.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud.sql:jdbc-socket-factory-core:1.18.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud.sql:postgres-socket-factory:1.18.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigquerystorage:3.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigtable-stats:2.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigtable:2.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-grpc:2.32.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigquerystorage:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigtable-stats:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigtable:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-grpc:2.36.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core-http:2.31.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core:2.32.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-firestore:3.16.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-monitoring:3.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-pubsub:1.126.5=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-pubsublite:1.12.22=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-secretmanager:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-spanner:6.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core:2.36.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-firestore:3.20.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-monitoring:3.39.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-pubsub:1.127.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-pubsublite:1.13.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-secretmanager:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-spanner:6.62.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-storage:2.32.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-tasks:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-tasks:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:grpc-gcp:1.5.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.20.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
 com.google.code.gson:gson:2.10.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.common.html.types:types:1.0.6=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -152,8 +152,8 @@ com.google.gwt:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-apache-v2:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-appengine:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-gson:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-jackson2:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-protobuf:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-jackson2:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-protobuf:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.inject.extensions:guice-multibindings:4.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.inject:guice:4.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -163,14 +163,14 @@ com.google.j2objc:j2objc-annotations:3.0.0=deploy_jar,runtimeClasspath,testRunti
 com.google.jsinterop:jsinterop-annotations:2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.monitoring-client:metrics:1.0.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.monitoring-client:stackdriver:1.0.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-appengine:1.35.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-java6:1.35.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-jetty:1.35.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-servlet:1.35.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client:1.35.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:3.25.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-appengine:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-java6:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-jetty:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-servlet:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.template:soy:2021-02-01=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.truth:truth:1.4.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -200,11 +200,11 @@ com.squareup:kotlinpoet-jvm:1.15.1=deploy_jar,runtimeClasspath,testRuntimeClassp
 com.squareup:kotlinpoet:1.15.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.sun.istack:istack-commons-runtime:3.0.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.sun.xml.fastinfoset:FastInfoset:1.2.15=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.thoughtworks.paranamer:paranamer:2.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.zaxxer:HikariCP:5.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 commons-beanutils:commons-beanutils:1.9.4=checkstyle
 commons-codec:commons-codec:1.16.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 commons-collections:commons-collections:3.2.2=checkstyle
+commons-io:commons-io:2.16.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 dnsjava:dnsjava:3.5.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 info.picocli:picocli:4.6.2=checkstyle
@@ -215,17 +215,17 @@ io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,deploy_jar,er
 io.grpc:grpc-alts:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-api:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-auth:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-census:1.61.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-census:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-context:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-core:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-googleapis:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-grpclb:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-inprocess:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-netty-shaded:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-netty:1.61.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-netty:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-protobuf-lite:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-protobuf:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-rls:1.61.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-rls:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-services:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-stub:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-util:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -274,53 +274,51 @@ javax.validation:validation-api:1.0.0.GA=deploy_jar,runtimeClasspath,testRuntime
 javax.xml.bind:jaxb-api:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 joda-time:joda-time:2.10.14=deploy_jar,runtimeClasspath,testRuntimeClasspath
 junit:junit:4.13.2=testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.12.18=deploy_jar,runtimeClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.12=deploy_jar,runtimeClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.13.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 net.sf.saxon:Saxon-HE:10.6=checkstyle
 org.antlr:antlr4-runtime:4.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.9.3=checkstyle
-org.apache.arrow:arrow-format:15.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.arrow:arrow-memory-core:15.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.arrow:arrow-vector:15.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.avro:avro:1.8.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-fn-execution:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-job-management:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-pipeline:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-core-java:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-java-fn-execution:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-core:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-expansion-service:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-arrow:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-avro:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-harness:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-transform-service-launcher:2.55.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-format:15.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-memory-core:15.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-vector:15.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.avro:avro:1.11.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-fn-execution:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-job-management:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-pipeline:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-core-java:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-java-fn-execution:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-core:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-expansion-service:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-arrow:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-avro:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-harness:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-transform-service-launcher:2.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apache.beam:beam-vendor-grpc-1_60_1:0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apache.commons:commons-compress:1.24.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.apache.commons:commons-csv:1.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.apache.commons:commons-csv:1.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.9=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.14=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.16=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.bouncycastle:bcpg-jdk18on:1.78=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.bouncycastle:bcpkix-jdk18on:1.78=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.bouncycastle:bcprov-jdk18on:1.78=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.bouncycastle:bcutil-jdk18on:1.78=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.bouncycastle:bcpg-jdk18on:1.78.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.bouncycastle:bcpkix-jdk18on:1.78.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.bouncycastle:bcprov-jdk18on:1.78.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.bouncycastle:bcutil-jdk18on:1.78.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.12.0=checkstyle
 org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor
 org.checkerframework:checker-qual:3.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.codehaus.jackson:jackson-core-asl:1.9.13=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.codehaus.jackson:jackson-mapper-asl:1.9.13=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.conscrypt:conscrypt-openjdk-uber:2.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.eclipse.collections:eclipse-collections-api:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.eclipse.collections:eclipse-collections:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.flywaydb:flyway-core:10.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.flywaydb:flyway-database-postgresql:10.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.flywaydb:flyway-core:10.13.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.flywaydb:flyway-database-postgresql:10.13.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-runtime:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.gwtproject:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -351,9 +349,9 @@ org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=deploy_jar,runtimeClasspath,testRun
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.jetbrains:annotations:17.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.jline:jline:3.25.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.jline:jline:3.26.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.joda:joda-money:1.0.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.json:json:20231013=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.json:json:20240303=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.jsoup:jsoup:1.17.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.jvnet.staxex:stax-ex:1.8=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.ogce:xpp3:1.1.6=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -371,12 +369,11 @@ org.rnorth.duct-tape:duct-tape:1.0.8=deploy_jar,runtimeClasspath,testRuntimeClas
 org.slf4j:slf4j-api:2.1.0-alpha1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-jdk14:2.1.0-alpha1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.testcontainers:database-commons:1.19.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.testcontainers:jdbc:1.19.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.testcontainers:postgresql:1.19.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.testcontainers:testcontainers:1.19.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.threeten:threetenbp:1.6.8=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.tukaani:xz:1.5=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.testcontainers:database-commons:1.19.8=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.testcontainers:jdbc:1.19.8=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.testcontainers:postgresql:1.19.8=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.testcontainers:testcontainers:1.19.8=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.threeten:threetenbp:1.6.9=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.w3c.css:sac:1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.xerial.snappy:snappy-java:1.1.10.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.yaml:snakeyaml:2.2=deploy_jar,runtimeClasspath,testRuntimeClasspath

jetty/logging.properties

@@ -0,0 +1,5 @@
+# Default logging configuration for Nomulus container.
+
+# Turn off logging in Hibernate classes for misleading ERROR-level logs
+org.hibernate.engine.jdbc.batch.internal.BatchingBatch.level=OFF
+org.hibernate.engine.jdbc.spi.SqlExceptionHelper.level=OFF

jetty/start.sh

@@ -15,4 +15,6 @@
 
 environment=$1
 cd /jetty-base
-java -jar /usr/local/jetty/start.jar -Dgoogle.registry.environment=${environment:-"alpha"}
+java -Dgoogle.registry.environment=${environment:-"alpha"} \
+    -Djava.util.logging.config.file=/logging.properties \
+    -jar /usr/local/jetty/start.jar

networking/gradle.lockfile

@@ -11,20 +11,20 @@ com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRunt
 com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.131.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.131.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.37.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.32.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:api-common:2.29.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.133.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.133.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.39.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.34.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:api-common:2.31.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-stubs:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-remote-api:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-tools-sdk:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -32,7 +32,7 @@ com.google.auto.value:auto-value-annotations:1.10.4=deploy_jar,runtimeClasspath,
 com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.auto.value:auto-value:1.10.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.cloud:google-cloud-tasks:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-tasks:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.10.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor
@@ -57,7 +57,8 @@ com.google.guava:guava-parent:32.1.1-jre=errorprone
 com.google.guava:guava:31.0.1-jre=checkstyle
 com.google.guava:guava:32.1.1-jre=errorprone
 com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:33.1.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.1.0-jre=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.guava:guava:33.2.0-jre=compileClasspath,testCompileClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-apache-v2:1.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-gson:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -66,12 +67,12 @@ com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProce
 com.google.j2objc:j2objc-annotations:1.3=checkstyle
 com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.34.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:3.25.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.truth:truth:1.4.2=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.ibm.icu:icu4j:74.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.ibm.icu:icu4j:75.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.puppycrawl.tools:checkstyle:9.3=checkstyle
 com.squareup:javapoet:1.13.0=annotationProcessor,testAnnotationProcessor
 com.squareup:kotlinpoet:1.11.0=annotationProcessor,testAnnotationProcessor
@@ -110,8 +111,6 @@ io.netty:netty-transport:4.1.109.Final=compileClasspath,deploy_jar,runtimeClassp
 io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.activation:activation:1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -130,9 +129,9 @@ org.apache.commons:commons-compress:1.24.0=testCompileClasspath,testRuntimeClass
 org.apache.httpcomponents:httpclient:4.5.14=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.16=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.bouncycastle:bcpkix-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcprov-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcutil-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpkix-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath
 org.checkerframework:checker-compat-qual:2.5.5=annotationProcessor,testAnnotationProcessor
 org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -154,16 +153,16 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotation
 org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProcessor
 org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor
 org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.10.2=testRuntimeClasspath
-org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-runner:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-api:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-commons:1.11.0-M1=testRuntimeClasspath
+org.junit:junit-bom:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.6=jacocoAnt
 org.ow2.asm:asm-tree:9.6=jacocoAnt
@@ -172,8 +171,8 @@ org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotatio
 org.reflections:reflections:0.10.2=checkstyle
 org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:junit-jupiter:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:testcontainers:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.threeten:threetenbp:1.6.8=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.threeten:threetenbp:1.6.9=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.yaml:snakeyaml:2.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 empty=

prober/gradle.lockfile

@@ -11,20 +11,20 @@ com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRunt
 com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.131.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.131.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.37.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.32.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:api-common:2.29.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax:2.46.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.133.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.133.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.39.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.34.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:api-common:2.31.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax:2.48.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-stubs:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-remote-api:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-tools-sdk:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -32,7 +32,7 @@ com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,deploy_jar,
 com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.auto.value:auto-value:1.10.4=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
 com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.cloud:google-cloud-tasks:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-tasks:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.10.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor
@@ -57,7 +57,8 @@ com.google.guava:guava-parent:32.1.1-jre=errorprone
 com.google.guava:guava:31.0.1-jre=checkstyle
 com.google.guava:guava:32.1.1-jre=errorprone
 com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:33.1.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.1.0-jre=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.guava:guava:33.2.0-jre=compileClasspath,testCompileClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-apache-v2:1.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-gson:1.44.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -68,13 +69,13 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,deploy_jar,runtimeCl
 com.google.monitoring-client:contrib:1.0.7=testCompileClasspath,testRuntimeClasspath
 com.google.monitoring-client:metrics:1.0.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.34.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:3.25.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.1=compileClasspath,testCompileClasspath
 com.google.re2j:re2j:1.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.truth:truth:1.4.2=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.ibm.icu:icu4j:74.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.ibm.icu:icu4j:75.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.puppycrawl.tools:checkstyle:9.3=checkstyle
 com.squareup:javapoet:1.13.0=annotationProcessor,testAnnotationProcessor
 com.squareup:kotlinpoet:1.11.0=annotationProcessor,testAnnotationProcessor
@@ -113,8 +114,6 @@ io.netty:netty-transport:4.1.109.Final=compileClasspath,deploy_jar,runtimeClassp
 io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.activation:activation:1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -125,8 +124,8 @@ javax.mail:mail:1.5.0-b01=deploy_jar,runtimeClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.4.0-b180830.0359=deploy_jar,runtimeClasspath,testRuntimeClasspath
 joda-time:joda-time:2.12.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.12=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.12=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.15=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.15=testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath
 net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor
 net.sf.saxon:Saxon-HE:10.6=checkstyle
@@ -135,9 +134,9 @@ org.apache.commons:commons-compress:1.24.0=testCompileClasspath,testRuntimeClass
 org.apache.httpcomponents:httpclient:4.5.14=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.16=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.bouncycastle:bcpkix-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcprov-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcutil-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpkix-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath
 org.checkerframework:checker-compat-qual:2.5.5=annotationProcessor,testAnnotationProcessor
 org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -159,17 +158,17 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotation
 org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProcessor
 org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor
 org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.10.2=testRuntimeClasspath
-org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.11.0=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-runner:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-api:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-commons:1.11.0-M1=testRuntimeClasspath
+org.junit:junit-bom:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:5.12.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.6=jacocoAnt
@@ -179,9 +178,9 @@ org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotatio
 org.reflections:reflections:0.10.2=checkstyle
 org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:junit-jupiter:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:testcontainers:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.threeten:threetenbp:1.6.8=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.threeten:threetenbp:1.6.9=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.yaml:snakeyaml:2.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 xerces:xmlParserAPIs:2.6.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=

processor/gradle.lockfile

@@ -21,7 +21,7 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,deploy_jar,runtimeClasspat
 com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.guava:guava:31.0.1-jre=checkstyle
 com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.guava:guava:33.1.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.2.0-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.j2objc:j2objc-annotations:1.3=checkstyle

proxy/gradle.lockfile

@@ -13,26 +13,26 @@ com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRunt
 com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.1-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.1-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-storage-v2:2.36.1-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.131.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.131.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.37.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.32.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:api-common:2.29.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.46.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:2.46.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax:2.46.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-cloudkms:v1-rev20240314-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-monitoring:v3-rev20240414-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-storage:v1-rev20240311-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.26=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:gapic-google-cloud-storage-v2:2.38.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-storage-v2:2.38.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-storage-v2:2.38.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.133.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.133.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.39.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.34.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:api-common:2.31.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.48.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:2.48.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax:2.48.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-cloudkms:v1-rev20240502-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-monitoring:v3-rev20240427-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-stubs:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-remote-api:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-tools-sdk:2.0.27=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -40,11 +40,11 @@ com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,deploy_jar,
 com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.auto.value:auto-value:1.10.4=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
 com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.cloud:google-cloud-core-grpc:2.36.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-http:2.36.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core:2.36.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-storage:2.36.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-tasks:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-grpc:2.38.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-http:2.38.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core:2.38.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-storage:2.38.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-tasks:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.10.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor
@@ -83,13 +83,13 @@ com.google.monitoring-client:contrib:1.0.7=testCompileClasspath,testRuntimeClass
 com.google.monitoring-client:metrics:1.0.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.35.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:3.25.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.protobuf:protobuf-java:3.25.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.1=compileClasspath,testCompileClasspath
 com.google.re2j:re2j:1.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.truth:truth:1.4.2=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.ibm.icu:icu4j:74.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.ibm.icu:icu4j:75.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.puppycrawl.tools:checkstyle:9.3=checkstyle
 com.squareup:javapoet:1.13.0=annotationProcessor,testAnnotationProcessor
 com.squareup:kotlinpoet:1.11.0=annotationProcessor,testAnnotationProcessor
@@ -129,8 +129,6 @@ io.netty:netty-transport:4.1.109.Final=compileClasspath,deploy_jar,runtimeClassp
 io.opencensus:opencensus-api:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.activation:activation:1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -141,8 +139,8 @@ javax.mail:mail:1.5.0-b01=deploy_jar,runtimeClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.4.0-b180830.0359=deploy_jar,runtimeClasspath,testRuntimeClasspath
 joda-time:joda-time:2.12.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.12=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.12=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.15=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.15=testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath
 net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor
 net.sf.saxon:Saxon-HE:10.6=checkstyle
@@ -151,9 +149,9 @@ org.apache.commons:commons-compress:1.24.0=testCompileClasspath,testRuntimeClass
 org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.bouncycastle:bcpkix-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcprov-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcutil-jdk18on:1.78=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpkix-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath
 org.checkerframework:checker-compat-qual:2.5.5=annotationProcessor,testAnnotationProcessor
 org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -176,17 +174,17 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotation
 org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProcessor
 org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor
 org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.10.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.10.2=testRuntimeClasspath
-org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.11.0=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-runner:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-api:1.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-commons:1.11.0-M1=testRuntimeClasspath
+org.junit:junit-bom:5.11.0-M1=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:5.12.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-commons:9.6=jacocoAnt
@@ -196,8 +194,8 @@ org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotatio
 org.reflections:reflections:0.10.2=checkstyle
 org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:junit-jupiter:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.testcontainers:testcontainers:1.19.7=testCompileClasspath,testRuntimeClasspath
-org.threeten:threetenbp:1.6.8=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath
+org.threeten:threetenbp:1.6.9=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.yaml:snakeyaml:2.2=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=

proxy/src/main/java/google/registry/proxy/GcpJsonFormatter.java

@@ -1,112 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.proxy;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.gson.Gson;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.logging.Formatter;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-
-/**
- * JUL formatter that formats log messages in a single-line JSON that Stackdriver logging can parse.
- *
- * <p>There is no clear documentation on how to achieve this or on the format of the JSON. This is
- * much a trial and error process, plus a lot of searching. To summarize, if the logs are printed to
- * {@code STDOUT} or {@code STDERR} in a single-line JSON, with the content in the {@code message}
- * field and the log level in the {@code severity} field, it will be picked up by Stackdriver
- * logging agent running in GKE containers and logged at correct level..
- *
- * @see <a
- *     href="https://medium.com/retailmenot-engineering/formatting-python-logs-for-stackdriver-5a5ddd80761c">
- *     Formatting Python Logs from Stackdriver</a> <a
- *     href="https://stackoverflow.com/questions/44164730/gke-stackdriver-java-logback-logging-format">
- *     GKE & Stackdriver: Java logback logging format?</a>
- */
-class GcpJsonFormatter extends Formatter {
-
-  /** JSON field that determines the log level. */
-  private static final String SEVERITY = "severity";
-
-  /**
-   * JSON field that stores the calling class and function when the log occurs.
-   *
-   * <p>This field is not used by Stackdriver, but it is useful and can be found when the log
-   * entries are expanded
-   */
-  private static final String SOURCE = "source";
-
-  /** JSON field that contains the content, this will show up as the main entry in a log. */
-  private static final String MESSAGE = "message";
-
-  private static final Gson gson = new Gson();
-
-  @Override
-  public String format(LogRecord record) {
-    // Add an extra newline before the message. Stackdriver does not show newlines correctly, and
-    // treats them as whitespace. If you want to see correctly formatted log message, expand the
-    // log and look for the jsonPayload.message field. This newline makes sure that the entire
-    // message starts on its own line, so that indentation within the message is correct.
-
-    String message = "\n" + record.getMessage();
-    String severity = severityFor(record.getLevel());
-
-    // The rest is mostly lifted from java.util.logging.SimpleFormatter.
-    String stacktrace = "";
-    if (record.getThrown() != null) {
-      StringWriter sw = new StringWriter();
-      try (PrintWriter pw = new PrintWriter(sw)) {
-        pw.println();
-        record.getThrown().printStackTrace(pw);
-      }
-      stacktrace = sw.toString();
-    }
-
-    String source;
-    if (record.getSourceClassName() != null) {
-      source = record.getSourceClassName();
-      if (record.getSourceMethodName() != null) {
-        source += " " + record.getSourceMethodName();
-      }
-    } else {
-      source = record.getLoggerName();
-    }
-
-    return gson.toJson(
-            ImmutableMap.of(SEVERITY, severity, SOURCE, source, MESSAGE, message + stacktrace))
-        + '\n';
-  }
-
-  /**
-   * Map {@link Level} to a severity string that Stackdriver understands.
-   *
-   * @see <a
-   *     href="https://github.com/googleapis/google-cloud-java/blob/master/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java#L325">{@code LoggingHandler}</a>
-   */
-  private static String severityFor(Level level) {
-    return switch (level.intValue()) {
-      case 300 -> "DEBUG"; // FINEST
-      case 400 -> "DEBUG"; // FINER
-      case 500 -> "DEBUG"; // FINE
-      case 700 -> "INFO"; // CONFIG
-      case 800 -> "INFO"; // INFO
-      case 900 -> "WARNING"; // WARNING
-      case 1000 -> "ERROR"; // SEVERE
-      default -> "DEFAULT";
-    };
-  }
-}

proxy/src/main/java/google/registry/proxy/ProxyModule.java

@@ -45,6 +45,7 @@ import google.registry.proxy.WebWhoisProtocolsModule.HttpsWhoisProtocol;
 import google.registry.proxy.WhoisProtocolModule.WhoisProtocol;
 import google.registry.proxy.handler.ProxyProtocolHandler;
 import google.registry.util.Clock;
+import google.registry.util.GcpJsonFormatter;
 import google.registry.util.GoogleCredentialsBundle;
 import google.registry.util.JdkLoggerConfig;
 import google.registry.util.OidcTokenUtils;
@@ -138,8 +139,7 @@ public class ProxyModule {
       // "io.netty.handler.logging.LoggingHandler" to actually process the logs. This JUL logger is
       // set to Level.FINE if the --log parameter is passed, so that it does not filter out logs
       // that the LoggingHandler writes. Otherwise, the logs are silently ignored because the
-      // default
-      // JUL logger level is Level.INFO.
+      // default JUL logger level is Level.INFO.
       JdkLoggerConfig.getConfig(LoggingHandler.class).setLevel(Level.FINE);
       // Log source IP information if --log parameter is passed. This is considered PII and should
       // only be used in non-production environment for debugging purpose.

proxy/src/main/java/google/registry/proxy/handler/QuotaHandler.java

@@ -59,7 +59,7 @@ public abstract class QuotaHandler extends ChannelInboundHandlerAdapter {
     if (quotaResponse == null) {
       String userId = getUserId(ctx);
       checkNotNull(userId, "Cannot obtain User ID");
-      quotaResponse = quotaManager.acquireQuota(QuotaRequest.create(userId));
+      quotaResponse = quotaManager.acquireQuota(new QuotaRequest(userId));
       if (!quotaResponse.success()) {
         String protocolName = ctx.channel().attr(PROTOCOL_KEY).get().name();
         metrics.registerQuotaRejection(protocolName, isUserIdPii() ? "none" : userId);

proxy/src/main/java/google/registry/proxy/quota/QuotaManager.java

@@ -14,7 +14,6 @@
 
 package google.registry.proxy.quota;
 
-import com.google.auto.value.AutoValue;
 import google.registry.proxy.quota.TokenStore.TimestampedInteger;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -40,42 +39,16 @@ import org.joda.time.DateTime;
 public class QuotaManager {
 
   /** Value class representing a quota request. */
-  @AutoValue
-  public abstract static class QuotaRequest {
-
-    public static QuotaRequest create(String userId) {
-      return new AutoValue_QuotaManager_QuotaRequest(userId);
-    }
-
-    abstract String userId();
-  }
+  public record QuotaRequest(String userId) {}
 
   /** Value class representing a quota response. */
-  @AutoValue
-  public abstract static class QuotaResponse {
-    public static QuotaResponse create(
-        boolean success, String userId, DateTime grantedTokenRefillTime) {
-      return new AutoValue_QuotaManager_QuotaResponse(success, userId, grantedTokenRefillTime);
-    }
-
-    public abstract boolean success();
-
-    abstract String userId();
-
-    abstract DateTime grantedTokenRefillTime();
-  }
+  public record QuotaResponse(boolean success, String userId, DateTime grantedTokenRefillTime) {}
 
   /** Value class representing a quota rebate. */
-  @AutoValue
-  public abstract static class QuotaRebate {
+  public record QuotaRebate(String userId, DateTime grantedTokenRefillTime) {
     public static QuotaRebate create(QuotaResponse response) {
-      return new AutoValue_QuotaManager_QuotaRebate(
-          response.userId(), response.grantedTokenRefillTime());
+      return new QuotaRebate(response.userId(), response.grantedTokenRefillTime());
     }
-
-    abstract String userId();
-
-    abstract DateTime grantedTokenRefillTime();
   }
 
   private final TokenStore tokenStore;
@@ -91,7 +64,7 @@ public class QuotaManager {
   /** Attempts to acquire requested quota, synchronously. */
   public QuotaResponse acquireQuota(QuotaRequest request) {
     TimestampedInteger tokens = tokenStore.take(request.userId());
-    return QuotaResponse.create(tokens.value() != 0, request.userId(), tokens.timestamp());
+    return new QuotaResponse(tokens.value() != 0, request.userId(), tokens.timestamp());
   }
 
   /** Returns granted quota to the token store, asynchronously. */

proxy/src/test/java/google/registry/proxy/GcpJsonFormatterTest.java

@@ -1,102 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.proxy;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.common.base.Joiner;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/** Unit tests for {@link google.registry.proxy.GcpJsonFormatter}. */
-class GcpJsonFormatterTest {
-
-  private static final String LOGGER_NAME = "example.company.app.logger";
-  private static final String SOURCE_CLASS_NAME = "example.company.app.component.Doer";
-  private static final String SOURCE_METHOD_NAME = "doStuff";
-  private static final String MESSAGE = "Something I have to say";
-
-  private final GcpJsonFormatter formatter = new GcpJsonFormatter();
-  private final LogRecord logRecord = new LogRecord(Level.WARNING, MESSAGE);
-
-  private static String makeJson(String severity, String source, String message) {
-    return "{"
-        + Joiner.on(",")
-            .join(
-                makeJsonField("severity", severity),
-                makeJsonField("source", source),
-                makeJsonField("message", "\\n" + message))
-        + "}\n";
-  }
-
-  private static String makeJsonField(String name, String content) {
-    return Joiner.on(":").join(addQuoteAndReplaceNewline(name), addQuoteAndReplaceNewline(content));
-  }
-
-  private static String addQuoteAndReplaceNewline(String content) {
-    // This quadruple escaping is hurting my eyes.
-    return "\"" + content.replaceAll("\n", "\\\\n") + "\"";
-  }
-
-  @BeforeEach
-  void beforeEach() {
-    logRecord.setLoggerName(LOGGER_NAME);
-  }
-
-  @Test
-  void testSuccess() {
-    String actual = formatter.format(logRecord);
-    String expected = makeJson("WARNING", LOGGER_NAME, MESSAGE);
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  void testSuccess_sourceClassAndMethod() {
-    logRecord.setSourceClassName(SOURCE_CLASS_NAME);
-    logRecord.setSourceMethodName(SOURCE_METHOD_NAME);
-    String actual = formatter.format(logRecord);
-    String expected = makeJson("WARNING", SOURCE_CLASS_NAME + " " + SOURCE_METHOD_NAME, MESSAGE);
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  void testSuccess_multilineMessage() {
-    String multilineMessage = "First line message\nSecond line message\n";
-    logRecord.setMessage(multilineMessage);
-    String actual = formatter.format(logRecord);
-    String expected = makeJson("WARNING", LOGGER_NAME, multilineMessage);
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  void testSuccess_withCause() {
-    Throwable throwable = new Throwable("Some reason");
-    StackTraceElement[] stacktrace = {
-      new StackTraceElement("class1", "method1", "file1", 5),
-      new StackTraceElement("class2", "method2", "file2", 10),
-    };
-    String stacktraceString =
-        "java.lang.Throwable: Some reason\\n"
-            + "\\tat class1.method1(file1:5)\\n"
-            + "\\tat class2.method2(file2:10)\\n";
-    throwable.setStackTrace(stacktrace);
-    logRecord.setThrown(throwable);
-    String actual = formatter.format(logRecord);
-    String expected = makeJson("WARNING", LOGGER_NAME, MESSAGE + "\\n" + stacktraceString);
-    assertThat(actual).isEqualTo(expected);
-  }
-}

proxy/src/test/java/google/registry/proxy/handler/EppQuotaHandlerTest.java

@@ -78,14 +78,14 @@ class EppQuotaHandlerTest {
 
   @Test
   void testSuccess_quotaGrantedAndReturned() {
-    when(quotaManager.acquireQuota(QuotaRequest.create(clientCertHash)))
-        .thenReturn(QuotaResponse.create(true, clientCertHash, now));
+    when(quotaManager.acquireQuota(new QuotaRequest(clientCertHash)))
+        .thenReturn(new QuotaResponse(true, clientCertHash, now));
 
     // First read, acquire quota.
     assertThat(channel.writeInbound(message)).isTrue();
     assertThat((Object) channel.readInbound()).isEqualTo(message);
     assertThat(channel.isActive()).isTrue();
-    verify(quotaManager).acquireQuota(QuotaRequest.create(clientCertHash));
+    verify(quotaManager).acquireQuota(new QuotaRequest(clientCertHash));
 
     // Second read, should not acquire quota again.
     Object newMessage = new Object();
@@ -96,19 +96,19 @@ class EppQuotaHandlerTest {
     // Channel closed, release quota.
     ChannelFuture unusedFuture = channel.close();
     verify(quotaManager)
-        .releaseQuota(QuotaRebate.create(QuotaResponse.create(true, clientCertHash, now)));
+        .releaseQuota(QuotaRebate.create(new QuotaResponse(true, clientCertHash, now)));
     verifyNoMoreInteractions(quotaManager);
   }
 
   @Test
   void testFailure_quotaNotGranted() {
-    when(quotaManager.acquireQuota(QuotaRequest.create(clientCertHash)))
-        .thenReturn(QuotaResponse.create(false, clientCertHash, now));
+    when(quotaManager.acquireQuota(new QuotaRequest(clientCertHash)))
+        .thenReturn(new QuotaResponse(false, clientCertHash, now));
     OverQuotaException e =
         assertThrows(OverQuotaException.class, () -> channel.writeInbound(message));
     ChannelFuture unusedFuture = channel.close();
     assertThat(e).hasMessageThat().contains(clientCertHash);
-    verify(quotaManager).acquireQuota(QuotaRequest.create(clientCertHash));
+    verify(quotaManager).acquireQuota(new QuotaRequest(clientCertHash));
     // Make sure that quotaManager.releaseQuota() is not called when the channel closes.
     verifyNoMoreInteractions(quotaManager);
     verify(metrics).registerQuotaRejection("epp", clientCertHash);
@@ -125,10 +125,10 @@ class EppQuotaHandlerTest {
     setProtocol(otherChannel);
     final DateTime later = now.plus(Duration.standardSeconds(1));
 
-    when(quotaManager.acquireQuota(QuotaRequest.create(clientCertHash)))
-        .thenReturn(QuotaResponse.create(true, clientCertHash, now));
-    when(quotaManager.acquireQuota(QuotaRequest.create(otherClientCertHash)))
-        .thenReturn(QuotaResponse.create(false, otherClientCertHash, later));
+    when(quotaManager.acquireQuota(new QuotaRequest(clientCertHash)))
+        .thenReturn(new QuotaResponse(true, clientCertHash, now));
+    when(quotaManager.acquireQuota(new QuotaRequest(otherClientCertHash)))
+        .thenReturn(new QuotaResponse(false, otherClientCertHash, later));
 
     // Allows the first user.
     assertThat(channel.writeInbound(message)).isTrue();
@@ -152,9 +152,9 @@ class EppQuotaHandlerTest {
     setProtocol(otherChannel);
     final DateTime later = now.plus(Duration.standardSeconds(1));
 
-    when(quotaManager.acquireQuota(QuotaRequest.create(clientCertHash)))
-        .thenReturn(QuotaResponse.create(true, clientCertHash, now))
-        .thenReturn(QuotaResponse.create(false, clientCertHash, later));
+    when(quotaManager.acquireQuota(new QuotaRequest(clientCertHash)))
+        .thenReturn(new QuotaResponse(true, clientCertHash, now))
+        .thenReturn(new QuotaResponse(false, clientCertHash, later));
 
     // Allows the first channel.
     assertThat(channel.writeInbound(message)).isTrue();

proxy/src/test/java/google/registry/proxy/handler/WhoisQuotaHandlerTest.java

@@ -77,14 +77,14 @@ class WhoisQuotaHandlerTest {
 
   @Test
   void testSuccess_quotaGranted() {
-    when(quotaManager.acquireQuota(QuotaRequest.create(remoteAddress)))
-        .thenReturn(QuotaResponse.create(true, remoteAddress, now));
+    when(quotaManager.acquireQuota(new QuotaRequest(remoteAddress)))
+        .thenReturn(new QuotaResponse(true, remoteAddress, now));
 
     // First read, acquire quota.
     assertThat(channel.writeInbound(message)).isTrue();
     assertThat((Object) channel.readInbound()).isEqualTo(message);
     assertThat(channel.isActive()).isTrue();
-    verify(quotaManager).acquireQuota(QuotaRequest.create(remoteAddress));
+    verify(quotaManager).acquireQuota(new QuotaRequest(remoteAddress));
 
     // Second read, should not acquire quota again.
     assertThat(channel.writeInbound(message)).isTrue();
@@ -97,8 +97,8 @@ class WhoisQuotaHandlerTest {
 
   @Test
   void testFailure_quotaNotGranted() {
-    when(quotaManager.acquireQuota(QuotaRequest.create(remoteAddress)))
-        .thenReturn(QuotaResponse.create(false, remoteAddress, now));
+    when(quotaManager.acquireQuota(new QuotaRequest(remoteAddress)))
+        .thenReturn(new QuotaResponse(false, remoteAddress, now));
     OverQuotaException e =
         assertThrows(OverQuotaException.class, () -> channel.writeInbound(message));
     assertThat(e).hasMessageThat().contains("none");
@@ -116,10 +116,10 @@ class WhoisQuotaHandlerTest {
     setProtocol(otherChannel);
     final DateTime later = now.plus(Duration.standardSeconds(1));
 
-    when(quotaManager.acquireQuota(QuotaRequest.create(remoteAddress)))
-        .thenReturn(QuotaResponse.create(true, remoteAddress, now));
-    when(quotaManager.acquireQuota(QuotaRequest.create(otherRemoteAddress)))
-        .thenReturn(QuotaResponse.create(false, otherRemoteAddress, later));
+    when(quotaManager.acquireQuota(new QuotaRequest(remoteAddress)))
+        .thenReturn(new QuotaResponse(true, remoteAddress, now));
+    when(quotaManager.acquireQuota(new QuotaRequest(otherRemoteAddress)))
+        .thenReturn(new QuotaResponse(false, otherRemoteAddress, later));
 
     // Allows the first user.
     assertThat(channel.writeInbound(message)).isTrue();
@@ -149,12 +149,12 @@ class WhoisQuotaHandlerTest {
     thirdChannel.attr(REMOTE_ADDRESS_KEY).set(remoteAddress);
     final DateTime evenLater = now.plus(Duration.standardSeconds(60));
 
-    when(quotaManager.acquireQuota(QuotaRequest.create(remoteAddress)))
-        .thenReturn(QuotaResponse.create(true, remoteAddress, now))
+    when(quotaManager.acquireQuota(new QuotaRequest(remoteAddress)))
+        .thenReturn(new QuotaResponse(true, remoteAddress, now))
         // Throttles the second connection.
-        .thenReturn(QuotaResponse.create(false, remoteAddress, later))
+        .thenReturn(new QuotaResponse(false, remoteAddress, later))
         // Allows the third connection because token refilled.
-        .thenReturn(QuotaResponse.create(true, remoteAddress, evenLater));
+        .thenReturn(new QuotaResponse(true, remoteAddress, evenLater));
 
     // Allows the first channel.
     assertThat(channel.writeInbound(message)).isTrue();

proxy/src/test/java/google/registry/proxy/quota/QuotaManagerTest.java

@@ -48,7 +48,7 @@ class QuotaManagerTest {
   void testSuccess_requestApproved() {
     when(tokenStore.take(anyString())).thenReturn(TimestampedInteger.create(1, clock.nowUtc()));
 
-    request = QuotaRequest.create(USER_ID);
+    request = new QuotaRequest(USER_ID);
     response = quotaManager.acquireQuota(request);
     assertThat(response.success()).isTrue();
     assertThat(response.userId()).isEqualTo(USER_ID);
@@ -59,7 +59,7 @@ class QuotaManagerTest {
   void testSuccess_requestDenied() {
     when(tokenStore.take(anyString())).thenReturn(TimestampedInteger.create(0, clock.nowUtc()));
 
-    request = QuotaRequest.create(USER_ID);
+    request = new QuotaRequest(USER_ID);
     response = quotaManager.acquireQuota(request);
     assertThat(response.success()).isFalse();
     assertThat(response.userId()).isEqualTo(USER_ID);
@@ -69,7 +69,7 @@ class QuotaManagerTest {
   @Test
   void testSuccess_rebate() {
     DateTime grantedTokenRefillTime = clock.nowUtc();
-    response = QuotaResponse.create(true, USER_ID, grantedTokenRefillTime);
+    response = new QuotaResponse(true, USER_ID, grantedTokenRefillTime);
     QuotaRebate rebate = QuotaRebate.create(response);
     Future<?> unusedFuture = quotaManager.releaseQuota(rebate);
     verify(tokenStore).scheduleRefresh();

release/build_nomulus_for_env.sh

@@ -51,6 +51,8 @@ else
     mv services/"${service}"/build/staged-app "${dest}/${service}"
   done
 
+  mkdir -p "${dest}/console" && cp -r console-webapp/staged/* "${dest}/console"
+
   mv core/build/resources/main/google/registry/env/common/META-INF \
     "${dest}/META-INF"
 

release/cloudbuild-nomulus.yaml

@@ -17,7 +17,19 @@ steps:
          '-PskipDockerIncompatibleTests=true',
          '-PmavenUrl=gcs://domain-registry-maven-repository/maven',
          '-PpluginsUrl=gcs://domain-registry-maven-repository/plugins'
-        ]
+  ]
+# Build Registry Console
+- name: 'gcr.io/${PROJECT_ID}/builder:latest'
+  # Set home for Gradle caches. Must be consistent with last step below
+  # and ./build_nomulus_for_env.sh
+  env: [ 'GRADLE_USER_HOME=/workspace/cloudbuild-caches' ]
+  entrypoint: /bin/bash
+  args:
+  - -c
+  - |
+    set -e
+    ./gradlew \
+      :console-webapp:buildConsoleWebappProd
 # Build and package the deployment files for each environment, and the tool
 # binary and image.
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'

release/cloudbuild-release.yaml

@@ -210,9 +210,9 @@ steps:
       $(gcloud auth list --format='get(account)' --filter=active)
     git add .
     git commit -m "Release commit for tag ${TAG_NAME}"
-    git push origin master
+    git push -o nokeycheck origin master 
     git tag ${TAG_NAME}
-    git push origin ${TAG_NAME}
+    git push -o nokeycheck origin ${TAG_NAME}
 timeout: 3600s
 options:
   machineType: 'E2_HIGHCPU_32'

services/backend/gradle.lockfile

@@ -27,72 +27,72 @@ com.github.jnr:jnr-posix:3.1.19=compileClasspath,runtimeClasspath,testCompileCla
 com.github.jnr:jnr-unixsocket:0.38.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:2.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:2.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:2.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:2.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:gapic-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.173.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.173.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-bigtable-v2:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.108.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-cloud-spanner-v1:6.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-bigtable-v2:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.109.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.62.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.62.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-cloud-spanner-v1:6.62.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:grpc-google-common-protos:2.37.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.173.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.173.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-bigtable-v2:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-datastore-v1:0.109.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-firestore-v1:3.16.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:grpc-google-common-protos:2.39.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.176.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-bigtable-v2:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-datastore-v1:0.110.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-firestore-v1:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0=compileClasspath,testCompileClasspath
-com.google.api.grpc:proto-google-cloud-monitoring-v3:3.36.0=runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-pubsub-v1:1.108.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.12.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-spanner-v1:6.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-monitoring-v3:3.39.0=runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-pubsub-v1:1.109.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.62.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.62.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.62.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-spanner-v1:6.62.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.131.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.131.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.37.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.32.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:api-common:2.29.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.46.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:2.46.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api:gax:2.46.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-admin-directory:directory_v1-rev20240304-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-appengine:v1-rev20240226-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-bigquery:v2-rev20240124-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240128-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-dataflow:v1b3-rev20240113-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.133.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.133.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.39.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.34.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:api-common:2.31.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.48.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:2.48.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api:gax:2.48.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-appengine:v1-rev20240415-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-bigquery:v2-rev20240229-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-dataflow:v1b3-rev20240218-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-dns:v2beta1-rev99-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-drive:v2-rev393-1.25.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-gmail:v1-rev20231218-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-gmail:v1-rev20240422-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-groupssettings:v1-rev20210624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-iam:v2-rev20240314-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-monitoring:v3-rev20240414-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-monitoring:v3-rev20240427-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-sheets:v4-rev20240402-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-sheets:v4-rev20240423-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20240324-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-storage:v1-rev20240205-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.26=runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.26=runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.26=runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.26=runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-storage:v1-rev20240311-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:2.0.27=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-stubs:2.0.27=runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-remote-api:2.0.27=runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:2.0.27=runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-tools-sdk:2.0.27=runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -101,26 +101,26 @@ com.google.auto.value:auto-value:1.10.4=compileClasspath,runtimeClasspath,testCo
 com.google.cloud.bigdataoss:gcsio:2.2.16=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.bigdataoss:util:2.2.16=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.bigtable:bigtable-client-core-config:1.28.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud.datastore:datastore-v1-proto-client:2.18.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud.datastore:datastore-v1-proto-client:2.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.sql:jdbc-socket-factory-core:1.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud.sql:postgres-socket-factory:1.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigquerystorage:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigtable-stats:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-bigtable:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core-grpc:2.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigquerystorage:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigtable-stats:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-bigtable:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core-grpc:2.36.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core-http:2.31.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-core:2.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-firestore:3.16.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-core:2.36.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-firestore:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-monitoring:1.82.0=compileClasspath,testCompileClasspath
-com.google.cloud:google-cloud-monitoring:3.36.0=runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-pubsub:1.126.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-pubsublite:1.12.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-secretmanager:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-spanner:6.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-monitoring:3.39.0=runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-pubsub:1.127.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-pubsublite:1.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-secretmanager:2.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-spanner:6.62.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-tasks:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-tasks:2.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.cloud:grpc-gcp:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.10.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.common.html.types:types:1.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -138,8 +138,8 @@ com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClas
 com.google.http-client:google-http-client-apache-v2:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-appengine:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-gson:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-jackson2:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-protobuf:1.43.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-jackson2:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-protobuf:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client:1.44.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.inject.extensions:guice-multibindings:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.inject:guice:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -147,13 +147,13 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,runtimeClasspath,tes
 com.google.jsinterop:jsinterop-annotations:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.monitoring-client:metrics:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.monitoring-client:stackdriver:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-appengine:1.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-java6:1.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-jetty:1.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-servlet:1.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client:1.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:3.25.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:3.25.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-appengine:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-java6:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-jetty:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-servlet:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.template:soy:2021-02-01=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.truth:truth:1.4.2=runtimeClasspath,testRuntimeClasspath
@@ -182,9 +182,9 @@ com.squareup:kotlinpoet-jvm:1.15.1=compileClasspath,runtimeClasspath,testCompile
 com.squareup:kotlinpoet:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.sun.istack:istack-commons-runtime:3.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.paranamer:paranamer:2.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.zaxxer:HikariCP:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-codec:commons-codec:1.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -193,24 +193,21 @@ io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClass
 io.grpc:grpc-alts:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-api:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-auth:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-census:1.61.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-census:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-context:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-core:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-googleapis:1.62.2=runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-grpclb:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-inprocess:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-netty:1.61.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-netty:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-protobuf-lite:1.62.2=runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-protobuf:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-rls:1.61.0=runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-services:1.61.0=compileClasspath,testCompileClasspath
-io.grpc:grpc-services:1.62.2=runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-rls:1.62.2=runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-services:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-stub:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.grpc:grpc-util:1.61.0=compileClasspath,testCompileClasspath
-io.grpc:grpc-util:1.62.2=runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-xds:1.61.0=compileClasspath,testCompileClasspath
-io.grpc:grpc-xds:1.62.2=runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-util:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.grpc:grpc-xds:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-buffer:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-http2:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-http:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -255,50 +252,48 @@ javax.servlet:servlet-api:2.5=compileClasspath,runtimeClasspath,testCompileClass
 javax.validation:validation-api:1.0.0.GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 joda-time:joda-time:2.10.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.12.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.arrow:arrow-format:15.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.arrow:arrow-memory-core:15.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.arrow:arrow-vector:15.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.avro:avro:1.8.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-fn-execution:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-job-management:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-model-pipeline:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-core-java:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-google-cloud-dataflow-java:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-runners-java-fn-execution:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-core:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-expansion-service:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-arrow:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-avro:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-extensions-protobuf:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-harness:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.beam:beam-sdks-java-transform-service-launcher:2.55.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-format:15.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-memory-core:15.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.arrow:arrow-vector:15.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-fn-execution:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-job-management:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-model-pipeline:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-core-java:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-google-cloud-dataflow-java:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-runners-java-fn-execution:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-core:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-expansion-service:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-arrow:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-avro:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-extensions-protobuf:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-harness:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.beam:beam-sdks-java-transform-service-launcher:2.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-compress:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.commons:commons-csv:1.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.commons:commons-csv:1.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcpg-jdk18on:1.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcpkix-jdk18on:1.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcprov-jdk18on:1.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.bouncycastle:bcutil-jdk18on:1.78=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpg-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcpkix-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath
 org.checkerframework:checker-compat-qual:2.5.6=runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
 org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-core:10.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.flywaydb:flyway-database-postgresql:10.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-core:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.flywaydb:flyway-database-postgresql:10.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -323,9 +318,9 @@ org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=compileClasspath,runtimeClasspath,t
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=runtimeClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=runtimeClasspath,testRuntimeClasspath
 org.jetbrains:annotations:17.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jline:jline:3.25.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jline:jline:3.26.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.joda:joda-money:1.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.json:json:20231013=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.json:json:20240303=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jsoup:jsoup:1.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jvnet.staxex:stax-ex:1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.ogce:xpp3:1.1.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -340,12 +335,11 @@ org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompi
 org.slf4j:slf4j-api:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-jdk14:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.1=runtimeClasspath,testRuntimeClasspath
-org.testcontainers:database-commons:1.19.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.testcontainers:jdbc:1.19.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.testcontainers:postgresql:1.19.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.testcontainers:testcontainers:1.19.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.threeten:threetenbp:1.6.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.tukaani:xz:1.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:database-commons:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:jdbc:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:postgresql:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.testcontainers:testcontainers:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.threeten:threetenbp:1.6.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.w3c.css:sac:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.xerial.snappy:snappy-java:1.1.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.yaml:snakeyaml:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath