Delete MultiplyingCloudDnsWriter

Now that the large zone re-signing test is complete, we no longer need it.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=199507075

java/google/registry/backup/BUILD

@@ -16,10 +16,10 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_appengine_mapreduce",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/batch/BUILD

@@ -21,12 +21,12 @@ java_library(
         "//java/google/registry/request:modules",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
+        "//third_party/java/appengine_pipeline",
         "//third_party/objectify:objectify-v4_1",
         "@com_google_apis_google_api_services_bigquery",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_appengine_mapreduce",
-        "@com_google_appengine_tools_appengine_pipeline",
         "@com_google_auto_factory",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",

java/google/registry/bigquery/BUILD

@@ -8,10 +8,11 @@ java_library(
     name = "bigquery",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/api/client/extensions/appengine/http",
+        "//java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2",
         "//java/google/registry/config",
         "//java/google/registry/util",
         "@com_google_api_client",
-        "@com_google_api_client_appengine",
         "@com_google_apis_google_api_services_bigquery",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
@@ -19,7 +20,6 @@ java_library(
         "@com_google_flogger_system_backend",
         "@com_google_guava",
         "@com_google_http_client",
-        "@com_google_http_client_appengine",
         "@com_google_http_client_jackson2",
         "@joda_time",
     ],

java/google/registry/config/BUILD

@@ -10,7 +10,7 @@ java_library(
     resources = glob(["files/*.yaml"]),
     deps = [
         "//java/google/registry/util",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/cron/BUILD

@@ -12,8 +12,8 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/dns/BUILD

@@ -27,8 +27,8 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/request/lock",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java

@@ -59,7 +59,6 @@ public abstract class CloudDnsWriterModule {
   @IntoMap
   @StringKey(CloudDnsWriter.NAME)
   abstract DnsWriter provideWriter(CloudDnsWriter writer);
-
   @Provides
   @IntoSet
   @Named("dnsWriterNames")

java/google/registry/export/BUILD

@@ -20,13 +20,13 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/storage/drive",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
         "//third_party/objectify:objectify-v4_1",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_bigquery",
         "@com_google_apis_google_api_services_drive",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_appengine_mapreduce",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/export/sheet/BUILD

@@ -14,10 +14,10 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/request/lock",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_sheets",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/flows/BUILD

@@ -34,8 +34,8 @@ java_library(
         "//java/google/registry/tmch",
         "//java/google/registry/util",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/gcs/BUILD

@@ -9,7 +9,7 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         "//java/google/registry/config",
-        "@com_google_appengine_tools_appengine_gcs_client",
+        "//third_party/java/appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/loadtest/BUILD

@@ -14,8 +14,8 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/security",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_dagger",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",

java/google/registry/mapreduce/BUILD

@@ -11,10 +11,10 @@ java_library(
         "//java/google/registry/mapreduce/inputs",
         "//java/google/registry/request",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
+        "//third_party/java/appengine_pipeline",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_mapreduce",
-        "@com_google_appengine_tools_appengine_pipeline",
         "@com_google_dagger",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",

java/google/registry/mapreduce/inputs/BUILD

@@ -10,10 +10,10 @@ java_library(
     deps = [
         "//java/google/registry/model",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
+        "//third_party/java/appengine_pipeline",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_mapreduce",
-        "@com_google_appengine_tools_appengine_pipeline",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/model/BUILD

@@ -16,9 +16,9 @@ java_library(
         "//java/google/registry/config",
         "//java/google/registry/util",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/jaxb",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/module/backend/BUILD

@@ -37,7 +37,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/tmch",
         "//java/google/registry/util",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/module/frontend/BUILD

@@ -21,7 +21,7 @@ java_library(
         "//java/google/registry/ui",
         "//java/google/registry/ui/server/registrar",
         "//java/google/registry/util",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/module/pubapi/BUILD

@@ -20,7 +20,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
         "//java/google/registry/whois",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/module/tools/BUILD

@@ -25,7 +25,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/tools/server",
         "//java/google/registry/util",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/monitoring/whitebox/BUILD

@@ -14,11 +14,11 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_bigquery",
         "@com_google_apis_google_api_services_monitoring",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/rde/BUILD

@@ -21,12 +21,12 @@ java_library(
         "//java/google/registry/util",
         "//java/google/registry/xjc",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
         "//third_party/jaxb",
         "//third_party/jsch/v0_1_53",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_appengine_mapreduce",
         "@com_google_auto_factory",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",

java/google/registry/rde/imports/BUILD

@@ -20,11 +20,11 @@ java_library(
         "//java/google/registry/util",
         "//java/google/registry/xjc",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
         "//third_party/jaxb",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_appengine_mapreduce",
         "@com_google_auto_factory",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",

java/google/registry/reporting/billing/BUILD

@@ -11,6 +11,7 @@ java_library(
         "@com_google_apis_google_api_services_bigquery",
     ],
     deps = [
+        "//java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2",
         "//java/google/registry/config",
         "//java/google/registry/gcs",
         "//java/google/registry/model",
@@ -19,10 +20,9 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/storage/drive",
         "//java/google/registry/util",
-        "@com_google_api_client_appengine",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
         "@com_google_apis_google_api_services_dataflow",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_dagger",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",

java/google/registry/reporting/icann/BUILD

@@ -19,10 +19,10 @@ java_library(
         "//java/google/registry/util",
         "//java/google/registry/xjc",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_bigquery",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/request/BUILD

@@ -14,7 +14,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/request/lock",
         "//java/google/registry/util",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
@@ -31,15 +31,15 @@ java_library(
     name = "modules",
     srcs = ["Modules.java"],
     deps = [
+        "//java/com/google/api/client/extensions/appengine/http",
+        "//java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2",
         "//java/google/registry/config",
         "//java/google/registry/keyring/api",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_api_client",
-        "@com_google_api_client_appengine",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_dagger",
         "@com_google_guava",
         "@com_google_http_client",
-        "@com_google_http_client_appengine",
         "@com_google_http_client_jackson2",
     ],
 )

java/google/registry/request/auth/BUILD

@@ -10,7 +10,7 @@ java_library(
     deps = [
         "//java/google/registry/config",
         "//java/google/registry/security",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/security/BUILD

@@ -13,8 +13,8 @@ java_library(
     deps = [
         "//java/google/registry/model",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",

java/google/registry/tmch/BUILD

@@ -20,8 +20,8 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/tools/BUILD

@@ -66,15 +66,15 @@ java_library(
         "//java/google/registry/whois",
         "//java/google/registry/xjc",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine:appengine-remote-api",
+        "//third_party/java/appengine:appengine-remote-api-link",
         "//third_party/jaxb",
         "//third_party/objectify:objectify-v4_1",
         "@com_beust_jcommander",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_bigquery",
         "@com_google_apis_google_api_services_dns",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_remote_api",
-        "@com_google_appengine_remote_api//:link",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
@@ -104,8 +104,8 @@ java_binary(
     main_class = "google.registry.tools.RegistryTool",
     runtime_deps = [
         ":tools",
-        "@com_google_appengine_api_1_0_sdk//:link",
+        "//third_party/java/appengine:appengine-api-link",
-        "@com_google_appengine_remote_api//:link",
+        "//third_party/java/appengine:appengine-remote-api-link",
     ],
 )
 

java/google/registry/tools/server/BUILD

@@ -20,12 +20,12 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
+        "//third_party/java/appengine_pipeline",
         "//third_party/objectify:objectify-v4_1",
         "@com_beust_jcommander",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_appengine_mapreduce",
-        "@com_google_appengine_tools_appengine_pipeline",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/ui/BUILD

@@ -62,7 +62,7 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//java/google/registry/config",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_guava",

java/google/registry/ui/server/BUILD

@@ -17,7 +17,7 @@ java_library(
         "//java/google/registry/ui",
         "//java/google/registry/ui/forms",
         "//java/google/registry/util",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",
         "@com_google_re2j",

java/google/registry/ui/server/registrar/BUILD

@@ -25,9 +25,9 @@ java_library(
         "//java/google/registry/ui/soy:soy_java_wrappers",
         "//java/google/registry/ui/soy/registrar:soy_java_wrappers",
         "//java/google/registry/util",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
         "@com_braintreepayments_gateway_braintree_java",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

java/google/registry/util/BUILD

@@ -8,9 +8,9 @@ java_library(
     name = "util",
     srcs = glob(["*.java"]),
     deps = [
+        "//third_party/java/appengine:appengine-api",
         "//third_party/jaxb",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_errorprone_error_prone_annotations",

java/google/registry/whois/BUILD

@@ -14,8 +14,8 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

javatests/google/registry/backup/BUILD

@@ -17,9 +17,9 @@ java_library(
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/testing/mapreduce",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine_gcs_client",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",

javatests/google/registry/batch/BUILD

@@ -20,13 +20,13 @@ java_library(
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/testing/mapreduce",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-stubs",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
+        "//third_party/java/appengine_pipeline",
         "//third_party/objectify:objectify-v4_1",
         "@com_google_apis_google_api_services_bigquery",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_api_stubs",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_appengine_mapreduce",
-        "@com_google_appengine_tools_appengine_pipeline",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_guava",

javatests/google/registry/cron/BUILD

@@ -15,10 +15,10 @@ java_library(
         "//java/google/registry/model",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-stubs",
+        "//third_party/java/appengine:appengine-testing",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_api_stubs",
-        "@com_google_appengine_testing",
         "@com_google_guava",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",

javatests/google/registry/dns/BUILD

@@ -23,9 +23,9 @@ java_library(
         "//java/google/registry/request/lock",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-stubs",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_api_stubs",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_guava",

javatests/google/registry/export/BUILD

@@ -27,12 +27,12 @@ java_library(
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/testing/mapreduce",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-stubs",
+        "//third_party/java/appengine_gcs_client",
         "//third_party/objectify:objectify-v4_1",
         "@com_google_apis_google_api_services_bigquery",
         "@com_google_apis_google_api_services_drive",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_api_stubs",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

javatests/google/registry/flows/BUILD

@@ -38,9 +38,9 @@ java_library(
         "//javatests/google/registry/model",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/xml",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-testing",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_testing",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

javatests/google/registry/groups/BUILD

@@ -15,12 +15,12 @@ java_library(
         "//java/google/registry/groups",
         "//java/google/registry/model",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-stubs",
+        "//third_party/java/appengine:appengine-testing",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_admin_directory",
         "@com_google_apis_google_api_services_groupssettings",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_api_stubs",
-        "@com_google_appengine_testing",
         "@com_google_guava",
         "@com_google_http_client",
         "@com_google_http_client_jackson2",

javatests/google/registry/mapreduce/inputs/BUILD

@@ -16,10 +16,10 @@ java_library(
         "//java/google/registry/model",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-testing",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_testing",
-        "@com_google_appengine_tools_appengine_mapreduce",
         "@com_google_guava",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",

javatests/google/registry/model/BUILD

@@ -26,9 +26,9 @@ java_library(
         "//java/google/registry/xml",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/xml",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-testing",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_testing",
         "@com_google_code_findbugs_jsr305",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",

javatests/google/registry/module/backend/BUILD

@@ -11,7 +11,7 @@ java_library(
     resources = glob(["testdata/*"]),
     runtime_deps = [
         # TODO(b/19332643): Remove this dependency when Modules is lazy.
-        "@com_google_appengine_api_1_0_sdk//:testonly",
+        "//third_party/java/appengine:appengine-api-testonly",
     ],
     deps = [
         "//java/google/registry/module/backend",

javatests/google/registry/module/frontend/BUILD

@@ -11,7 +11,7 @@ java_library(
     resources = glob(["testdata/*"]),
     runtime_deps = [
         # TODO(b/19332643): Remove this dependency when Modules is lazy.
-        "@com_google_appengine_api_1_0_sdk//:testonly",
+        "//third_party/java/appengine:appengine-api-testonly",
     ],
     deps = [
         "//java/google/registry/module/frontend",

javatests/google/registry/module/pubapi/BUILD

@@ -11,7 +11,7 @@ java_library(
     resources = glob(["testdata/*"]),
     runtime_deps = [
         # TODO(b/19332643): Remove this dependency when Modules is lazy.
-        "@com_google_appengine_api_1_0_sdk//:testonly",
+        "//third_party/java/appengine:appengine-api-testonly",
     ],
     deps = [
         "//java/google/registry/module/pubapi",

javatests/google/registry/module/tools/BUILD

@@ -11,7 +11,7 @@ java_library(
     resources = glob(["testdata/*"]),
     runtime_deps = [
         # TODO(b/19332643): Remove this dependency when Modules is lazy.
-        "@com_google_appengine_api_1_0_sdk//:testonly",
+        "//third_party/java/appengine:appengine-api-testonly",
     ],
     deps = [
         "//java/google/registry/module/tools",

javatests/google/registry/monitoring/whitebox/BUILD

@@ -19,11 +19,11 @@ java_library(
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/testing/mapreduce",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-stubs",
+        "//third_party/java/appengine:appengine-testing",
         "//third_party/objectify:objectify-v4_1",
         "@com_google_apis_google_api_services_bigquery",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_api_stubs",
-        "@com_google_appengine_testing",
         "@com_google_auto_value",
         "@com_google_guava",
         "@com_google_guava_testlib",

javatests/google/registry/rdap/BUILD

@@ -20,8 +20,8 @@ java_library(
         "//java/google/registry/ui/server/registrar",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_guava",

javatests/google/registry/rde/BUILD

@@ -27,11 +27,11 @@ java_library(
         "//javatests/google/registry/testing/mapreduce",
         "//javatests/google/registry/testing/sftp",
         "//javatests/google/registry/xml",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine_gcs_client",
         "//third_party/jaxb",
         "//third_party/jsch/v0_1_53",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_flogger",

javatests/google/registry/rde/imports/BUILD

@@ -22,10 +22,10 @@ java_library(
         "//java/google/registry/xjc",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/testing/mapreduce",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine_gcs_client",
         "//third_party/jaxb",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_guava",

javatests/google/registry/reporting/BUILD

@@ -18,9 +18,9 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
         "@com_google_apis_google_api_services_bigquery",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_guava",

javatests/google/registry/reporting/billing/BUILD

@@ -16,9 +16,9 @@ java_library(
         "//java/google/registry/storage/drive",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
         "@com_google_apis_google_api_services_dataflow",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_dagger",
         "@com_google_guava",
         "@com_google_truth",

javatests/google/registry/reporting/icann/BUILD

@@ -18,9 +18,9 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine_gcs_client",
         "@com_google_apis_google_api_services_bigquery",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_guava",

javatests/google/registry/request/BUILD

@@ -15,7 +15,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/security",
         "//javatests/google/registry/testing",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
+        "//third_party/java/appengine:appengine-api-testonly",
         "@com_google_guava",
         "@com_google_guava_testlib",
         "@com_google_truth",

javatests/google/registry/request/auth/BUILD

@@ -16,10 +16,10 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/security",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-integration-testing",
+        "//third_party/java/appengine_gcs_client",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",
         "@com_google_truth",
@@ -27,7 +27,6 @@ java_library(
         "@javax_servlet_api",
         "@junit",
         "@org_mockito_all",
-        "@org_mortbay_jetty",
     ],
 )
 

javatests/google/registry/request/lock/BUILD

@@ -15,10 +15,10 @@ java_library(
         "//java/google/registry/model",
         "//java/google/registry/request/lock",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-integration-testing",
+        "//third_party/java/appengine_gcs_client",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",
         "@com_google_truth",
@@ -27,7 +27,6 @@ java_library(
         "@joda_time",
         "@junit",
         "@org_mockito_all",
-        "@org_mortbay_jetty",
     ],
 )
 

javatests/google/registry/security/BUILD

@@ -17,8 +17,8 @@ java_library(
         "//java/google/registry/security",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
+        "//third_party/java/appengine:appengine-api-testonly",
-        "@com_google_appengine_testing",
+        "//third_party/java/appengine:appengine-testing",
         "@com_google_guava",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",

javatests/google/registry/server/BUILD

@@ -18,14 +18,13 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//java/google/registry/util",
-        "@com_google_appengine_tools_sdk",
+        "//third_party/java/appengine:appengine-integration-testing",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",
         "@com_google_guava",
         "@javax_servlet_api",
-        "@org_mortbay_jetty",
     ],
 )
 
@@ -35,8 +34,8 @@ java_library(
     deps = [
         "//java/google/registry/model",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
         "@com_google_guava",
         "@joda_time",
     ],

javatests/google/registry/testing/BUILD

@@ -35,12 +35,12 @@ java_library(
         "//java/google/registry/tmch",
         "//java/google/registry/util",
         "//java/google/registry/xml",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-integration-testing",
+        "//third_party/java/appengine:appengine-stubs",
+        "//third_party/java/appengine:appengine-testing",
+        "//third_party/java/appengine_gcs_client",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_api_stubs",
-        "@com_google_appengine_testing",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
@@ -60,6 +60,5 @@ java_library(
         "@org_joda_money",
         "@org_json",
         "@org_mockito_all",
-        "@org_mortbay_jetty",
     ],
 )

javatests/google/registry/testing/mapreduce/BUILD

@@ -15,11 +15,11 @@ java_library(
         "//java/google/registry/mapreduce",
         "//java/google/registry/model",
         "//javatests/google/registry/testing",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
-        "@com_google_appengine_api_stubs",
+        "//third_party/java/appengine:appengine-stubs",
-        "@com_google_appengine_testing",
+        "//third_party/java/appengine:appengine-testing",
-        "@com_google_appengine_tools_appengine_mapreduce",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
-        "@com_google_appengine_tools_appengine_pipeline",
+        "//third_party/java/appengine_pipeline",
         "@com_google_code_findbugs_jsr305",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",

javatests/google/registry/tmch/BUILD

@@ -23,8 +23,8 @@ java_library(
         "//java/google/registry/tmch",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",
         "@com_google_truth",

javatests/google/registry/tools/BUILD

@@ -36,13 +36,13 @@ java_library(
         "//javatests/google/registry/testing",
         "//javatests/google/registry/tools/server",
         "//javatests/google/registry/xml",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine:appengine-remote-api-link",
         "//third_party/jaxb",
         "//third_party/objectify:objectify-v4_1",
         "@com_beust_jcommander",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_dns",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_remote_api//:link",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",

javatests/google/registry/tools/server/BUILD

@@ -22,11 +22,11 @@ java_library(
         "//javatests/google/registry/model",
         "//javatests/google/registry/testing",
         "//javatests/google/registry/testing/mapreduce",
+        "//third_party/java/appengine:appengine-api-testonly",
+        "//third_party/java/appengine_gcs_client",
+        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
+        "//third_party/java/appengine_pipeline",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
-        "@com_google_appengine_tools_appengine_gcs_client",
-        "@com_google_appengine_tools_appengine_mapreduce",
-        "@com_google_appengine_tools_appengine_pipeline",
         "@com_google_guava",
         "@com_google_re2j",
         "@com_google_truth",

javatests/google/registry/ui/server/registrar/BUILD

@@ -24,9 +24,9 @@ java_library(
         "//java/google/registry/util",
         "//javatests/google/registry/security",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api-testonly",
         "//third_party/objectify:objectify-v4_1",
         "@com_braintreepayments_gateway_braintree_java",
-        "@com_google_appengine_api_1_0_sdk//:testonly",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",
         "@com_google_guava",

javatests/google/registry/util/BUILD

@@ -14,7 +14,7 @@ java_library(
         "//java/google/registry/config",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
-        "@com_google_appengine_api_1_0_sdk",
+        "//third_party/java/appengine:appengine-api",
         "@com_google_code_findbugs_jsr305",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",

javatests/google/registry/whois/BUILD

@@ -18,9 +18,9 @@ java_library(
         "//java/google/registry/util",
         "//java/google/registry/whois",
         "//javatests/google/registry/testing",
+        "//third_party/java/appengine:appengine-api",
+        "//third_party/java/appengine:appengine-testing",
         "//third_party/objectify:objectify-v4_1",
-        "@com_google_appengine_api_1_0_sdk",
-        "@com_google_appengine_testing",
         "@com_google_dagger",
         "@com_google_flogger",
         "@com_google_flogger_system_backend",