Revert "Upgrade App Engine Standard to Java 17 w/ bundled APIs (#1714 )" (#1724 )

* Revert "Upgrade App Engine Standard to Java 17 w/ bundled APIs (#1714)" This partially reverts commit d8e77e2ab2 (it keeps intact unrelated version upgrades). We need to temporarily revert this because Spinnaker isn't quite yet playing nice with the new <app-engine-apis> configuration option in appengine-web.xml (it seems like this was added recently and Spinnaker is still stuck on App Engine SDK version 1.9.82 which predates it). Hopefully we can get that dependency updated in Spinnaker soon and then we can re-upgrade to Java 17.
Flyway files for adding current_package_token column to Domain table (#1719 )
2026-07-07 16:46:56 +00:00 · 2022-07-29 16:08:36 -04:00 · 2022-07-29 12:35:43 -04:00 · 2022-07-29 11:40:11 -04:00 · 2022-07-29 11:39:56 -04:00 · 2022-07-28 15:24:31 -04:00
55 changed files with 4841 additions and 4891 deletions
@@ -163,7 +163,7 @@ def verifyDeploymentParams() {
        System.err.println('-----------------------------------------------------------------')
        throw new GradleException('Aborting. See prominent error above.')
    } else if (gcpProject == null) {
-        def error = 'You must specify -P environment={alpha,crash,qa}'
+        def error = 'You must specify -Penvironment={alpha,crash,qa}'
        System.err.println("\033[33;1m${error}\033[0m")
        throw GradleException("Aborting:  ${error}")
    }
@@ -31,10 +31,10 @@ com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,deploy_jar,nonpro
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,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=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:1.32.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:1.32.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.12.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.136.2=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -90,13 +90,12 @@ com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1=compileClasspat
 com.google.apis:google-api-services-sheets:v4-rev20220620-1.32.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20220623-1.32.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-1.32.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine.tools:appengine-gcs-client:0.8.3=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine.tools:appengine-gcs-client:0.8.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine.tools:appengine-pipeline:0.2.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-api-1.0-sdk:2.0.5=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-stubs:2.0.5=testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-remote-api:2.0.5=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.8.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -300,7 +299,7 @@ javax.validation:validation-api:1.0.0.GA=compileClasspath,default,deploy_jar,non
 javax.xml.bind:jaxb-api:2.3.1=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.4.0-b180830.0359=jaxb
 jline:jline:1.0=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-joda-time:joda-time:2.10.13=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+joda-time:joda-time:2.10.10=compileClasspath,default,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=default,nonprodCompileClasspath,nonprodRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.arnx:nashorn-promise:0.1.1=nonprodRuntime,runtime,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.12.10=testCompileClasspath,testRuntimeClasspath
@@ -266,7 +266,7 @@ public class DeleteProberDataAction implements Runnable {
    // Note that we don't bother handling grace periods, billing events, pending transfers, poll
    // messages, or auto-renews because those will all be hard-deleted the next time the job runs
    // anyway.
-    tm().putAllWithoutBackup(ImmutableList.of(deletedDomain, historyEntry));
+    tm().putAll(ImmutableList.of(deletedDomain, historyEntry));
    // updating foreign keys is a no-op in SQL
    updateForeignKeyIndexDeletionTime(deletedDomain);
    dnsQueue.addDomainRefreshTask(deletedDomain.getDomainName());
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>backend</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>default</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>pubapi</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>tools</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>backend</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>default</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4_1G</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>pubapi</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>tools</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>backend</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>default</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4_1G</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>pubapi</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>tools</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>backend</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4_1G</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>default</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4_1G</instance-class>
  <manual-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>pubapi</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4_1G</instance-class>
  <manual-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>tools</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4_1G</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>backend</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>default</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>F4_1G</instance-class>
  <automatic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>pubapi</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>tools</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>backend</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>default</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4_1G</instance-class>
  <manual-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>pubapi</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4_1G</instance-class>
  <manual-scaling>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">

-  <runtime>java17</runtime>
-  <app-engine-apis>true</app-engine-apis>
+  <runtime>java8</runtime>
  <service>tools</service>
+  <threadsafe>true</threadsafe>
  <sessions-enabled>true</sessions-enabled>
  <instance-class>B4</instance-class>
  <basic-scaling>
@@ -197,7 +197,7 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton {
            MigrationState.DATASTORE_ONLY,
            "migrationTransitionMap must start with DATASTORE_ONLY");
    validateTransitionAtCurrentTime(transitions);
-    jpaTm().putWithoutBackup(new DatabaseMigrationStateSchedule(transitions));
+    jpaTm().put(new DatabaseMigrationStateSchedule(transitions));
    CACHE.invalidateAll();
  }

@@ -66,7 +66,7 @@ public class ServerSecret extends CrossTldSingleton {
              Optional<ServerSecret> secret = tm().loadSingleton(ServerSecret.class);
              if (!secret.isPresent()) {
                secret = Optional.of(create(UUID.randomUUID()));
-                tm().insertWithoutBackup(secret.get());
+                tm().insert(secret.get());
              }
              return secret.get();
            });
@@ -56,7 +56,7 @@ public final class TmchCrl extends CrossTldSingleton {
              tmchCrl.updated = jpaTm().getTransactionTime();
              tmchCrl.crl = checkNotNull(crl, "crl");
              tmchCrl.url = checkNotNull(url, "url");
-              jpaTm().transactNew(() -> jpaTm().putWithoutBackup(tmchCrl));
+              jpaTm().put(tmchCrl);
            });
  }

@@ -293,16 +293,6 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
    insertAll(ImmutableSet.copyOf(entities));
  }

-  @Override
-  public void insertWithoutBackup(ImmutableObject entity) {
-    insert(entity);
-  }
-
-  @Override
-  public void insertAllWithoutBackup(ImmutableCollection<?> entities) {
-    insertAll(entities);
-  }
-
  @Override
  public void put(Object entity) {
    checkArgumentNotNull(entity, "entity must be specified");
@@ -329,16 +319,6 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
    entities.forEach(this::put);
  }

-  @Override
-  public void putWithoutBackup(ImmutableObject entity) {
-    put(entity);
-  }
-
-  @Override
-  public void putAllWithoutBackup(ImmutableCollection<?> entities) {
-    putAll(entities);
-  }
-
  @Override
  public void update(Object entity) {
    checkArgumentNotNull(entity, "entity must be specified");
@@ -362,16 +342,6 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
    updateAll(ImmutableList.copyOf(entities));
  }

-  @Override
-  public void updateWithoutBackup(ImmutableObject entity) {
-    update(entity);
-  }
-
-  @Override
-  public void updateAllWithoutBackup(ImmutableCollection<?> entities) {
-    updateAll(entities);
-  }
-
  @Override
  public <T> boolean exists(VKey<T> key) {
    checkArgumentNotNull(key, "key must be specified");
@@ -549,21 +519,6 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
    return managedEntity;
  }

-  @Override
-  public void deleteWithoutBackup(VKey<?> key) {
-    delete(key);
-  }
-
-  @Override
-  public void deleteWithoutBackup(Iterable<? extends VKey<?>> keys) {
-    delete(keys);
-  }
-
-  @Override
-  public void deleteWithoutBackup(Object entity) {
-    delete(entity);
-  }
-
  @Override
  public <T> QueryComposer<T> createQueryComposer(Class<T> entity) {
    return new JpaQueryComposerImpl<>(entity);
@@ -101,30 +101,6 @@ public interface TransactionManager {
  /** Persists all new entities in the database, throws exception if any entity already exists. */
  void insertAll(ImmutableObject... entities);

-  /**
-   * Persists a new entity in the database without writing any backup if the underlying database is
-   * Datastore.
-   *
-   * <p>This method is for the sake of keeping a single code path when replacing ofy() with tm() in
-   * the application code. When the method is invoked with Datastore, it won't write the commit log
-   * backup; when invoked with Cloud SQL, it behaves the same as the method which doesn't have
-   * "WithoutBackup" in its method name because it is not necessary to have the backup mechanism in
-   * SQL.
-   */
-  void insertWithoutBackup(ImmutableObject entity);
-
-  /**
-   * Persists all new entities in the database without writing any backup if the underlying database
-   * is Datastore.
-   *
-   * <p>This method is for the sake of keeping a single code path when replacing ofy() with tm() in
-   * the application code. When the method is invoked with Datastore, it won't write the commit log
-   * backup; when invoked with Cloud SQL, it behaves the same as the method which doesn't have
-   * "WithoutBackup" in its method name because it is not necessary to have the backup mechanism in
-   * SQL.
-   */
-  void insertAllWithoutBackup(ImmutableCollection<?> entities);
-
  /** Persists a new entity or update the existing entity in the database. */
  void put(Object entity);

@@ -134,30 +110,6 @@ public interface TransactionManager {
  /** Persists all new entities or updates the existing entities in the database. */
  void putAll(ImmutableCollection<?> entities);

-  /**
-   * Persists a new entity or update the existing entity in the database without writing commit logs
-   * if the underlying database is Datastore.
-   *
-   * <p>This method is for the sake of keeping a single code path when replacing ofy() with tm() in
-   * the application code. When the method is invoked with Datastore, it won't write the commit log
-   * backup; when invoked with Cloud SQL, it behaves the same as the method which doesn't have
-   * "WithoutBackup" in its method name because it is not necessary to have the backup mechanism in
-   * SQL.
-   */
-  void putWithoutBackup(ImmutableObject entity);
-
-  /**
-   * Persists all new entities or update the existing entities in the database without writing
-   * commit logs if the underlying database is Datastore.
-   *
-   * <p>This method is for the sake of keeping a single code path when replacing ofy() with tm() in
-   * the application code. When the method is invoked with Datastore, it won't write the commit log
-   * backup; when invoked with Cloud SQL, it behaves the same as the method which doesn't have
-   * "WithoutBackup" in its method name because it is not necessary to have the backup mechanism in
-   * SQL.
-   */
-  void putAllWithoutBackup(ImmutableCollection<?> entities);
-
  /** Updates an entity in the database, throws exception if the entity does not exist. */
  void update(Object entity);

@@ -167,30 +119,6 @@ public interface TransactionManager {
  /** Updates all entities in the database, throws exception if any entity does not exist. */
  void updateAll(ImmutableObject... entities);

-  /**
-   * Updates an entity in the database without writing commit logs if the underlying database is
-   * Datastore.
-   *
-   * <p>This method is for the sake of keeping a single code path when replacing ofy calls with tm()
-   * in the application code. When the method is invoked with Datastore, it won't write the commit
-   * log backup; when invoked with Cloud SQL, it behaves the same as the method which doesn't have
-   * "WithoutBackup" in its method name because it is not necessary to have the backup mechanism in
-   * SQL.
-   */
-  void updateWithoutBackup(ImmutableObject entity);
-
-  /**
-   * Updates all entities in the database without writing any backup if the underlying database is
-   * Datastore.
-   *
-   * <p>This method is for the sake of keeping a single code path when replacing ofy calls with tm()
-   * in the application code. When the method is invoked with Datastore, it won't write the commit
-   * log backup; when invoked with Cloud SQL, it behaves the same as the method which doesn't have
-   * "WithoutBackup" in its method name because it is not necessary to have the backup mechanism in
-   * SQL.
-   */
-  void updateAllWithoutBackup(ImmutableCollection<?> entities);
-
  /** Returns whether the given entity with same ID exists. */
  boolean exists(Object entity);

@@ -285,24 +213,6 @@ public interface TransactionManager {
   */
  <T> T delete(T entity);

-  /**
-   * Deletes the entity by its id without writing commit logs if the underlying database is
-   * Datastore.
-   */
-  void deleteWithoutBackup(VKey<?> key);
-
-  /**
-   * Deletes the set of entities by their key id without writing commit logs if the underlying
-   * database is Datastore.
-   */
-  void deleteWithoutBackup(Iterable<? extends VKey<?>> keys);
-
-  /**
-   * Deletes the given entity from the database without writing commit logs if the underlying
-   * database is Datastore.
-   */
-  void deleteWithoutBackup(Object entity);
-
  /** Returns a QueryComposer which can be used to perform queries against the current database. */
  <T> QueryComposer<T> createQueryComposer(Class<T> entity);

@@ -15,7 +15,6 @@
 package google.registry.tools;

 import com.google.common.collect.ImmutableMap;
-import google.registry.tools.javascrap.BackfillRegistrarBillingAccountsCommand;
 import google.registry.tools.javascrap.CompareEscrowDepositsCommand;

 /** Container class to create and run remote commands against a Datastore instance. */
@@ -30,7 +29,6 @@ public final class RegistryTool {
  public static final ImmutableMap<String, Class<? extends Command>> COMMAND_MAP =
      new ImmutableMap.Builder<String, Class<? extends Command>>()
          .put("ack_poll_messages", AckPollMessagesCommand.class)
-          .put("backfill_registrar_billing_accounts", BackfillRegistrarBillingAccountsCommand.class)
          .put("canonicalize_labels", CanonicalizeLabelsCommand.class)
          .put("check_domain", CheckDomainCommand.class)
          .put("check_domain_claims", CheckDomainClaimsCommand.class)
@@ -41,7 +41,6 @@ import google.registry.request.Modules.UrlConnectionServiceModule;
 import google.registry.request.Modules.UrlFetchServiceModule;
 import google.registry.request.Modules.UserServiceModule;
 import google.registry.tools.AuthModule.LocalCredentialModule;
-import google.registry.tools.javascrap.BackfillRegistrarBillingAccountsCommand;
 import google.registry.tools.javascrap.CompareEscrowDepositsCommand;
 import google.registry.util.UtilsModule;
 import google.registry.whois.NonCachingWhoisModule;
@@ -86,8 +85,6 @@ import javax.inject.Singleton;
 interface RegistryToolComponent {
  void inject(AckPollMessagesCommand command);

-  void inject(BackfillRegistrarBillingAccountsCommand command);
-
  void inject(CheckDomainClaimsCommand command);

  void inject(CheckDomainCommand command);
@@ -1,56 +0,0 @@
-// Copyright 2021 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.javascrap;
-
-import static com.google.common.base.Preconditions.checkState;
-import static google.registry.model.OteAccountBuilder.DEFAULT_BILLING_ACCOUNT_MAP;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-
-import com.beust.jcommander.Parameters;
-import google.registry.config.RegistryEnvironment;
-import google.registry.model.registrar.Registrar;
-import google.registry.tools.CommandWithRemoteApi;
-
-/**
- * Backfills the billing account maps on all Registrars that don't have any set.
- *
- * <p>This should not (and cannot) be used on production. Its purpose is to backfill these values on
- * sandbox, where most registrars have an empty billing account map, including all that were created
- * for OT&amp;E. The same default billing account map is used for all registrars, and includes
- * values for USD and JPY. The actual values here don't matter as we don't do invoicing on sandbox
- * anyway.
- */
-@Parameters(separators = " =", commandDescription = "Backfill registrar billing account maps.")
-public class BackfillRegistrarBillingAccountsCommand implements CommandWithRemoteApi {
-
-  @Override
-  public void run() throws Exception {
-    checkState(
-        RegistryEnvironment.get() != RegistryEnvironment.PRODUCTION,
-        "Do not run this on production");
-    System.out.println("Populating billing account maps on all registrars missing them ...");
-    tm().transact(
-            () ->
-                tm().loadAllOfStream(Registrar.class)
-                    .filter(r -> r.getBillingAccountMap().isEmpty())
-                    .forEach(
-                        r ->
-                            tm().update(
-                                    r.asBuilder()
-                                        .setBillingAccountMap(DEFAULT_BILLING_ACCOUNT_MAP)
-                                        .build())));
-    System.out.println("Done!");
-  }
-}
@@ -130,8 +130,7 @@ public class SyncGroupMembersActionTest {
  void test_doPost_removesAllContactsFromGroup() throws Exception {
    when(connection.getMembersOfGroup("newregistrar-primary-contacts@domain-registry.example"))
        .thenReturn(ImmutableSet.of("defunct@example.com", "janedoe@theregistrar.com"));
-    tm().transact(
-            () -> loadRegistrar("NewRegistrar").getContacts().forEach(tm()::deleteWithoutBackup));
+    tm().transact(() -> loadRegistrar("NewRegistrar").getContacts().forEach(tm()::delete));
    runAction();
    verify(connection).removeMemberFromGroup(
        "newregistrar-primary-contacts@domain-registry.example", "defunct@example.com");
@@ -173,16 +173,6 @@ public class ReplicaSimulatingJpaTransactionManager implements JpaTransactionMan
    delegate.insertAll(entities);
  }

-  @Override
-  public void insertWithoutBackup(ImmutableObject entity) {
-    delegate.insertWithoutBackup(entity);
-  }
-
-  @Override
-  public void insertAllWithoutBackup(ImmutableCollection<?> entities) {
-    delegate.insertAllWithoutBackup(entities);
-  }
-
  @Override
  public void put(Object entity) {
    delegate.put(entity);
@@ -198,16 +188,6 @@ public class ReplicaSimulatingJpaTransactionManager implements JpaTransactionMan
    delegate.putAll(entities);
  }

-  @Override
-  public void putWithoutBackup(ImmutableObject entity) {
-    delegate.putWithoutBackup(entity);
-  }
-
-  @Override
-  public void putAllWithoutBackup(ImmutableCollection<?> entities) {
-    delegate.putAllWithoutBackup(entities);
-  }
-
  @Override
  public void update(Object entity) {
    delegate.update(entity);
@@ -223,16 +203,6 @@ public class ReplicaSimulatingJpaTransactionManager implements JpaTransactionMan
    delegate.updateAll(entities);
  }

-  @Override
-  public void updateWithoutBackup(ImmutableObject entity) {
-    delegate.updateWithoutBackup(entity);
-  }
-
-  @Override
-  public void updateAllWithoutBackup(ImmutableCollection<?> entities) {
-    delegate.updateAllWithoutBackup(entities);
-  }
-
  @Override
  public <T> boolean exists(VKey<T> key) {
    return delegate.exists(key);
@@ -310,21 +280,6 @@ public class ReplicaSimulatingJpaTransactionManager implements JpaTransactionMan
    return delegate.delete(entity);
  }

-  @Override
-  public void deleteWithoutBackup(VKey<?> key) {
-    delegate.deleteWithoutBackup(key);
-  }
-
-  @Override
-  public void deleteWithoutBackup(Iterable<? extends VKey<?>> keys) {
-    delegate.deleteWithoutBackup(keys);
-  }
-
-  @Override
-  public void deleteWithoutBackup(Object entity) {
-    delegate.deleteWithoutBackup(entity);
-  }
-
  @Override
  public <T> QueryComposer<T> createQueryComposer(Class<T> entity) {
    return delegate.createQueryComposer(entity);
@@ -18,7 +18,6 @@ import static com.google.common.io.BaseEncoding.base16;
 import static google.registry.testing.DatabaseHelper.generateNewContactHostRoid;
 import static google.registry.testing.DatabaseHelper.generateNewDomainRoid;
 import static google.registry.testing.DatabaseHelper.persistResource;
-import static google.registry.testing.DatabaseHelper.persistResourceWithBackup;
 import static google.registry.testing.DatabaseHelper.persistSimpleResource;
 import static google.registry.util.DateTimeUtils.END_OF_TIME;
 import static org.joda.money.CurrencyUnit.USD;
@@ -76,7 +75,7 @@ final class RdeFixtures {
                .build());
    clock.advanceOneMilli();
    BillingEvent.OneTime billingEvent =
-        persistResourceWithBackup(
+        persistResource(
            new BillingEvent.OneTime.Builder()
                .setReason(Reason.CREATE)
                .setTargetId("example." + tld)
@@ -219,13 +218,13 @@ final class RdeFixtures {
                    .build())
            .build();
    clock.advanceOneMilli();
-    return persistResourceWithBackup(domain);
+    return persistResource(domain);
  }

  static ContactResource makeContactResource(
      FakeClock clock, String id, String name, String email) {
    clock.advanceOneMilli();
-    return persistResourceWithBackup(
+    return persistResource(
        new ContactResource.Builder()
            .setContactId(id)
            .setRepoId(generateNewContactHostRoid())
@@ -256,7 +255,7 @@ final class RdeFixtures {

  static HostResource makeHostResource(FakeClock clock, String fqhn, String ip) {
    clock.advanceOneMilli();
-    return persistResourceWithBackup(
+    return persistResource(
        new HostResource.Builder()
            .setRepoId(generateNewContactHostRoid())
            .setCreationRegistrarId("LawyerCat")
@@ -999,31 +999,9 @@ public class DatabaseHelper {
    return createRepoId(allocateId(), getContactAndHostRoidSuffix());
  }

-  /**
-   * Persists a test resource to Datastore and returns it.
-   *
-   * <p>Tests should always use this method (or the shortcut persist methods in this class) to
-   * persist test data, to avoid potentially subtle bugs related to race conditions and a stale ofy
-   * session cache. Specifically, this method calls .now() on the save to force the write to
-   * actually get sent to Datastore (although it does not force it to be applied) and clears the
-   * session cache. If necessary, this method also updates the relevant {@link EppResourceIndex},
-   * {@link ForeignKeyIndex}.
-   *
-   * <p><b>Note:</b> Your resource will not be enrolled in a commit log. If you want backups, use
-   * {@link #persistResourceWithBackup(Object)}.
-   */
-  public static <R extends ImmutableObject> R persistResource(final R resource) {
-    return persistResource(resource, false);
-  }
-
-  /** Same as {@link #persistResource(Object)} with backups enabled. */
-  public static <R extends ImmutableObject> R persistResourceWithBackup(final R resource) {
-    return persistResource(resource, true);
-  }
-
-  private static <R extends ImmutableObject> void saveResource(R resource, boolean wantBackup) {
+  private static <R extends ImmutableObject> void saveResource(R resource) {
    if (tm().isOfy()) {
-      Consumer<ImmutableObject> saver = wantBackup ? tm()::put : tm()::putWithoutBackup;
+      Consumer<ImmutableObject> saver = tm()::put;
      saver.accept(resource);
      if (resource instanceof EppResource) {
        EppResource eppResource = (EppResource) resource;
@@ -1046,12 +1024,12 @@ public class DatabaseHelper {
    }
  }

-  private static <R extends ImmutableObject> R persistResource(
-      final R resource, final boolean wantBackup) {
+  /** Persists an object in the DB for tests. */
+  public static <R extends ImmutableObject> R persistResource(final R resource) {
    assertWithMessage("Attempting to persist a Builder is almost certainly an error in test code")
        .that(resource)
        .isNotInstanceOf(Buildable.Builder.class);
-    tm().transact(() -> saveResource(resource, wantBackup));
+    tm().transact(() -> saveResource(resource));
    maybeAdvanceClock();
    // Force the session cache to be cleared so that when we read the resource back, we read from
    // Datastore and not from the session cache. This is needed to trigger Objectify's load process
@@ -1080,12 +1058,8 @@ public class DatabaseHelper {
    return tm().transact(() -> tm().loadByEntity(resource));
  }

+  /** Persists the specified resources to the DB. */
  public static <R extends ImmutableObject> void persistResources(final Iterable<R> resources) {
-    persistResources(resources, false);
-  }
-
-  private static <R extends ImmutableObject> void persistResources(
-      final Iterable<R> resources, final boolean wantBackup) {
    for (R resource : resources) {
      assertWithMessage("Attempting to persist a Builder is almost certainly an error in test code")
          .that(resource)
@@ -1093,7 +1067,7 @@ public class DatabaseHelper {
    }
    // Persist domains ten at a time, to avoid exceeding the entity group limit.
    for (final List<R> chunk : Iterables.partition(resources, 10)) {
-      tm().transact(() -> chunk.forEach(resource -> saveResource(resource, wantBackup)));
+      tm().transact(() -> chunk.forEach(DatabaseHelper::saveResource));
      maybeAdvanceClock();
    }
    // Force the session to be cleared so that when we read it back, we read from Datastore
@@ -1248,7 +1222,7 @@ public class DatabaseHelper {
   * entities.
   */
  public static <R> void insertSimpleResources(final Iterable<R> resources) {
-    tm().transact(() -> tm().putAllWithoutBackup(ImmutableList.copyOf(resources)));
+    tm().transact(() -> tm().putAll(ImmutableList.copyOf(resources)));
    maybeAdvanceClock();
    // Force the session to be cleared so that when we read it back, we read from Datastore
    // and not from the transaction's session cache.
@@ -1256,7 +1230,7 @@ public class DatabaseHelper {
  }

  public static void deleteResource(final Object resource) {
-    tm().transact(() -> tm().deleteWithoutBackup(resource));
+    tm().transact(() -> tm().delete(resource));
    // Force the session to be cleared so that when we read it back, we read from Datastore and
    // not from the transaction's session cache.
    tm().clearSessionCache();
@@ -122,7 +122,7 @@ public class MutatingCommandTest {
        Arrays.asList(host1, host2, registrar1, registrar2).stream()
            .map(entity -> VKey.from(Key.create(entity)))
            .collect(toImmutableList());
-    tm().transact(() -> tm().deleteWithoutBackup(keys));
+    tm().transact(() -> tm().delete(keys));
    MutatingCommand command = new MutatingCommand() {
      @Override
      protected void init() {
@@ -119,3 +119,4 @@ V118__drop_billing_identifier_column_from_registrar.sql
 V119__token_registration_behavior.sql
 V120__remove_ofy_key_fields.sql
 V121__drop_sql_checkpoint_and_txn.sql
+V122__add_current_package_token_to_domain.sql
@@ -0,0 +1,19 @@
+-- Copyright 2022 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+alter table "Domain" add column current_package_token text;
+alter table "DomainHistory" add column current_package_token text;
+
+ALTER TABLE "Domain" ADD CONSTRAINT fk_domain_current_package_token FOREIGN KEY (current_package_token) REFERENCES "AllocationToken"(token) DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE "DomainHistory" ADD CONSTRAINT fk_domain_history_current_package_token FOREIGN KEY (current_package_token) REFERENCES "AllocationToken"(token) DEFERRABLE INITIALLY DEFERRED;
@@ -400,7 +400,8 @@ CREATE TABLE public."Domain" (
    transfer_history_entry_id bigint,
    transfer_repo_id text,
    transfer_poll_message_id_3 bigint,
-    dns_refresh_request_time timestamp with time zone
+    dns_refresh_request_time timestamp with time zone,
+    current_package_token text
 );


@@ -488,7 +489,8 @@ CREATE TABLE public."DomainHistory" (
    transfer_history_entry_id bigint,
    transfer_repo_id text,
    transfer_poll_message_id_3 bigint,
-    dns_refresh_request_time timestamp with time zone
+    dns_refresh_request_time timestamp with time zone,
+    current_package_token text
 );


@@ -2162,6 +2164,22 @@ ALTER TABLE ONLY public."Domain"
    ADD CONSTRAINT fk_domain_billing_recurrence_id FOREIGN KEY (billing_recurrence_id) REFERENCES public."BillingRecurrence"(billing_recurrence_id) DEFERRABLE INITIALLY DEFERRED;


+--
+-- Name: Domain fk_domain_current_package_token; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."Domain"
+    ADD CONSTRAINT fk_domain_current_package_token FOREIGN KEY (current_package_token) REFERENCES public."AllocationToken"(token) DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: DomainHistory fk_domain_history_current_package_token; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public."DomainHistory"
+    ADD CONSTRAINT fk_domain_history_current_package_token FOREIGN KEY (current_package_token) REFERENCES public."AllocationToken"(token) DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: DomainHistory fk_domain_history_domain_repo_id; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -51,11 +51,12 @@ ext {
      // xml elements' names have changed.
      'com.sun.xml.bind:jaxb-xjc:2.3.3',

-      'com.google.appengine:appengine-api-1.0-sdk:2.0.5',
+      // appengine-api-1.0-sdk has breaking changes.
+      'com.google.appengine:appengine-api-1.0-sdk:1.9.86',
      // Pin-breakers for appengine-api-1.0-sdk
-      'com.google.appengine.tools:appengine-gcs-client:0.8.3',
+      'com.google.appengine.tools:appengine-gcs-client:0.8.1',
      'com.google.appengine.tools:appengine-pipeline:0.2.13',
-      'com.google.appengine:appengine-testing:2.0.5',
+      'com.google.appengine:appengine-testing:1.9.86',

      // Pinned for gwt-user.
      'com.google.javascript:closure-compiler:v20210505',
@@ -30,10 +30,10 @@ com.github.jnr:jnr-unixsocket:0.38.17=default,deploy_jar,runtimeClasspath,testRu
 com.github.jnr:jnr-x86asm:1.0.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.android:annotations:4.1.1.4=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:1.32.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:1.32.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:1.32.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.12.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.136.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -89,13 +89,12 @@ com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1=default,deploy_
 com.google.apis:google-api-services-sheets:v4-rev20220620-1.32.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20220623-1.32.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-1.32.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine.tools:appengine-gcs-client:0.8.3=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine.tools:appengine-gcs-client:0.8.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.appengine.tools:appengine-pipeline:0.2.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,testCompileClasspath
+com.google.appengine:appengine-api-1.0-sdk:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.appengine:appengine-remote-api:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.8.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -239,7 +238,7 @@ javax.activation:activation:1.1=default,deploy_jar,runtimeClasspath,testRuntimeC
 javax.activation:javax.activation-api:1.2.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 javax.annotation:jsr250-api:1.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-javax.inject:javax.inject:1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+javax.inject:javax.inject:1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.jdo:jdo2-api:2.3-20090302111651=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 javax.mail:mail:1.5.0-b01=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 javax.persistence:javax.persistence-api:2.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -247,7 +246,7 @@ javax.servlet:servlet-api:2.5=default,deploy_jar,runtimeClasspath,testRuntimeCla
 javax.validation:validation-api:1.0.0.GA=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.1=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 jline:jline:1.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-joda-time:joda-time:2.10.13=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+joda-time:joda-time:2.10.10=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 junit:junit:4.13.2=default,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.12.9=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -20,11 +20,8 @@ com.google.api:api-common:2.2.1=default,deploy_jar,runtimeClasspath,testRuntimeC
 com.google.api:gax-grpc:2.18.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api:gax-httpjson:0.103.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api:gax:2.18.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto.value:auto-value-annotations:1.8.1=testCompileClasspath
@@ -20,11 +20,8 @@ com.google.api:api-common:2.2.1=default,deploy_jar,runtimeClasspath,testRuntimeC
 com.google.api:gax-grpc:2.18.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api:gax-httpjson:0.103.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api:gax:2.18.2=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto.value:auto-value-annotations:1.8.1=testCompileClasspath
@@ -26,11 +26,8 @@ com.google.api:gax:2.18.2=compileClasspath,default,deploy_jar,runtimeClasspath,t
 com.google.apis:google-api-services-cloudkms:v1-rev20220701-1.32.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-monitoring:v3-rev20220715-1.32.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-1.32.1=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.7.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.7.0=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.value:auto-value-annotations:1.9=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -27,10 +27,10 @@ com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,runtimeClasspath,testCo
 com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.android:annotations:4.1.1.4=default,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.12.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.136.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -86,13 +86,11 @@ com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1=compileClasspat
 com.google.apis:google-api-services-sheets:v4-rev20220620-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20220623-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine.tools:appengine-gcs-client:0.8.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine.tools:appengine-gcs-client:0.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine.tools:appengine-pipeline:0.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-api-1.0-sdk:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,runtimeClasspath,testRuntimeClasspath
 com.google.appengine:appengine-remote-api:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -233,7 +231,7 @@ javax.servlet:servlet-api:2.5=compileClasspath,default,runtimeClasspath,testComp
 javax.validation:validation-api:1.0.0.GA=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jline:jline:1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-joda-time:joda-time:2.10.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+joda-time:joda-time:2.10.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.12.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.arrow:arrow-format:5.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -27,10 +27,10 @@ com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,runtimeClasspath,testCo
 com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.android:annotations:4.1.1.4=default,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.12.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.136.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -86,13 +86,11 @@ com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1=compileClasspat
 com.google.apis:google-api-services-sheets:v4-rev20220620-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20220623-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine.tools:appengine-gcs-client:0.8.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine.tools:appengine-gcs-client:0.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine.tools:appengine-pipeline:0.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-api-1.0-sdk:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,runtimeClasspath,testRuntimeClasspath
 com.google.appengine:appengine-remote-api:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -233,7 +231,7 @@ javax.servlet:servlet-api:2.5=compileClasspath,default,runtimeClasspath,testComp
 javax.validation:validation-api:1.0.0.GA=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jline:jline:1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-joda-time:joda-time:2.10.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+joda-time:joda-time:2.10.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.12.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.arrow:arrow-format:5.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -27,10 +27,10 @@ com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,runtimeClasspath,testCo
 com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.android:annotations:4.1.1.4=default,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.12.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.136.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -86,13 +86,11 @@ com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1=compileClasspat
 com.google.apis:google-api-services-sheets:v4-rev20220620-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20220623-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine.tools:appengine-gcs-client:0.8.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine.tools:appengine-gcs-client:0.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine.tools:appengine-pipeline:0.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-api-1.0-sdk:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,runtimeClasspath,testRuntimeClasspath
 com.google.appengine:appengine-remote-api:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -233,7 +231,7 @@ javax.servlet:servlet-api:2.5=compileClasspath,default,runtimeClasspath,testComp
 javax.validation:validation-api:1.0.0.GA=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jline:jline:1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-joda-time:joda-time:2.10.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+joda-time:joda-time:2.10.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.12.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.arrow:arrow-format:5.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -27,10 +27,10 @@ com.github.jnr:jnr-posix:3.1.15=compileClasspath,default,runtimeClasspath,testCo
 com.github.jnr:jnr-unixsocket:0.38.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.android:annotations:4.1.1.4=default,runtimeClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-appengine:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-appengine:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-jackson2:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client-java6:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.api-client:google-api-client-servlet:1.32.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.api-client:google-api-client-servlet:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api-client:google-api-client:1.35.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:2.12.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.136.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -86,13 +86,11 @@ com.google.apis:google-api-services-pubsub:v1-rev20211130-1.32.1=compileClasspat
 com.google.apis:google-api-services-sheets:v4-rev20220620-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20220623-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20220705-1.32.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine.tools:appengine-gcs-client:0.8.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine.tools:appengine-gcs-client:0.8.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine.tools:appengine-pipeline:0.2.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.appengine:appengine-api-1.0-sdk:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=default,runtimeClasspath,testRuntimeClasspath
 com.google.appengine:appengine-remote-api:2.0.5=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=default,runtimeClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=default,runtimeClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=default,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-oauth2-http:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -233,7 +231,7 @@ javax.servlet:servlet-api:2.5=compileClasspath,default,runtimeClasspath,testComp
 javax.validation:validation-api:1.0.0.GA=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.xml.bind:jaxb-api:2.3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jline:jline:1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-joda-time:joda-time:2.10.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+joda-time:joda-time:2.10.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.12.9=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.arrow:arrow-format:5.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -20,11 +20,10 @@ com.google.api:api-common:2.2.1=compileClasspath,default,deploy_jar,runtimeClass
 com.google.api:gax-grpc:2.18.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api:gax-httpjson:0.103.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.api:gax:2.18.2=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-1.0-sdk:2.0.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-api-stubs:2.0.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-remote-api:2.0.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-testing:2.0.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.appengine:appengine-tools-sdk:2.0.5=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:1.9.86=compileClasspath,default,deploy_jar,runtimeClasspath
+com.google.appengine:appengine-api-1.0-sdk:2.0.5=testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-api-stubs:2.0.5=testCompileClasspath,testRuntimeClasspath
+com.google.appengine:appengine-testing:1.9.86=compileClasspath,default,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auth:google-auth-library-credentials:1.8.1=compileClasspath,testCompileClasspath
 com.google.auth:google-auth-library-oauth2-http:1.7.0=default,deploy_jar,runtimeClasspath,testRuntimeClasspath
Author	SHA1	Message	Date
Ben McIlwain	950d12577f	Revert "Upgrade App Engine Standard to Java 17 w/ bundled APIs (#1714 )" (#1724 ) * Revert "Upgrade App Engine Standard to Java 17 w/ bundled APIs (#1714)" This partially reverts commit `d8e77e2ab2` (it keeps intact unrelated version upgrades). We need to temporarily revert this because Spinnaker isn't quite yet playing nice with the new <app-engine-apis> configuration option in appengine-web.xml (it seems like this was added recently and Spinnaker is still stuck on App Engine SDK version 1.9.82 which predates it). Hopefully we can get that dependency updated in Spinnaker soon and then we can re-upgrade to Java 17.	2022-07-29 16:08:36 -04:00
sarahcaseybot	5d559085d7	Flyway files for adding current_package_token column to Domain table (#1719 ) * Flyway files for adding allocationToken column to Domain table * Rename column to current_package_token * Update er diagram * Add foreign key to DomainHistory	2022-07-29 12:35:43 -04:00
Ben McIlwain	268c1048cc	Delete the BackfillRegistrarBillingAccounts scrap command (#1722 )	2022-07-29 11:40:11 -04:00
Ben McIlwain	74e22089fe	Remove the withoutBackup methods from TransactionManager (#1723 ) * Remove the withoutBackup methods from TransactionManager This doesn't do anything in Cloud SQL (it was for Ofy only).	2022-07-29 11:39:56 -04:00
Ben McIlwain	9914d4d04e	Fix environment specification error message in build.gradle :deploy (#1717 ) * Fix environment specification error message in build.gradle :deploy	2022-07-28 15:24:31 -04:00