diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD index b4e7a1574..437f07638 100644 --- a/java/google/registry/backup/BUILD +++ b/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", diff --git a/java/google/registry/batch/BUILD b/java/google/registry/batch/BUILD index f8da2463b..da30d5633 100644 --- a/java/google/registry/batch/BUILD +++ b/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", diff --git a/java/google/registry/bigquery/BUILD b/java/google/registry/bigquery/BUILD index c3d83d201..b7aeb89a5 100644 --- a/java/google/registry/bigquery/BUILD +++ b/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", ], diff --git a/java/google/registry/config/BUILD b/java/google/registry/config/BUILD index 7f1e7b6bc..bb033d7b1 100644 --- a/java/google/registry/config/BUILD +++ b/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", diff --git a/java/google/registry/cron/BUILD b/java/google/registry/cron/BUILD index 7af90fd21..7e7a34f27 100644 --- a/java/google/registry/cron/BUILD +++ b/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", diff --git a/java/google/registry/dns/BUILD b/java/google/registry/dns/BUILD index 69b101681..be3ad6e68 100644 --- a/java/google/registry/dns/BUILD +++ b/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", diff --git a/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java b/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java index f73d085c2..11e8a2f90 100644 --- a/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java +++ b/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") diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD index b1bf9a48f..5dc8a73e4 100644 --- a/java/google/registry/export/BUILD +++ b/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", diff --git a/java/google/registry/export/sheet/BUILD b/java/google/registry/export/sheet/BUILD index d0135a694..8221eac6b 100644 --- a/java/google/registry/export/sheet/BUILD +++ b/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", diff --git a/java/google/registry/flows/BUILD b/java/google/registry/flows/BUILD index 06adb214f..213949cb0 100644 --- a/java/google/registry/flows/BUILD +++ b/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", diff --git a/java/google/registry/gcs/BUILD b/java/google/registry/gcs/BUILD index 7ab141051..c524c4b0c 100644 --- a/java/google/registry/gcs/BUILD +++ b/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", diff --git a/java/google/registry/loadtest/BUILD b/java/google/registry/loadtest/BUILD index dbd503dfa..74d11c176 100644 --- a/java/google/registry/loadtest/BUILD +++ b/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", diff --git a/java/google/registry/mapreduce/BUILD b/java/google/registry/mapreduce/BUILD index 6a79a76cb..456df1cca 100644 --- a/java/google/registry/mapreduce/BUILD +++ b/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", diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD index 8ef99729b..d81eeebae 100644 --- a/java/google/registry/mapreduce/inputs/BUILD +++ b/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", diff --git a/java/google/registry/model/BUILD b/java/google/registry/model/BUILD index bce68a9e3..2e4fadce6 100644 --- a/java/google/registry/model/BUILD +++ b/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", diff --git a/java/google/registry/module/backend/BUILD b/java/google/registry/module/backend/BUILD index d0a4ed1cb..09b67c175 100644 --- a/java/google/registry/module/backend/BUILD +++ b/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", diff --git a/java/google/registry/module/frontend/BUILD b/java/google/registry/module/frontend/BUILD index b79a8db06..217a3ceac 100644 --- a/java/google/registry/module/frontend/BUILD +++ b/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", diff --git a/java/google/registry/module/pubapi/BUILD b/java/google/registry/module/pubapi/BUILD index 2c9573e58..e70f0cf97 100644 --- a/java/google/registry/module/pubapi/BUILD +++ b/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", diff --git a/java/google/registry/module/tools/BUILD b/java/google/registry/module/tools/BUILD index 17215d63a..0701e421f 100644 --- a/java/google/registry/module/tools/BUILD +++ b/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", diff --git a/java/google/registry/monitoring/whitebox/BUILD b/java/google/registry/monitoring/whitebox/BUILD index 10c93d0d8..6d92c88c6 100644 --- a/java/google/registry/monitoring/whitebox/BUILD +++ b/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", diff --git a/java/google/registry/rde/BUILD b/java/google/registry/rde/BUILD index cb5682b2b..db28b077a 100644 --- a/java/google/registry/rde/BUILD +++ b/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", diff --git a/java/google/registry/rde/imports/BUILD b/java/google/registry/rde/imports/BUILD index 52b68cd80..dd25bfe8c 100644 --- a/java/google/registry/rde/imports/BUILD +++ b/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", diff --git a/java/google/registry/reporting/billing/BUILD b/java/google/registry/reporting/billing/BUILD index 3d60662e7..c7afa7a8b 100644 --- a/java/google/registry/reporting/billing/BUILD +++ b/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", diff --git a/java/google/registry/reporting/icann/BUILD b/java/google/registry/reporting/icann/BUILD index 8435205e1..82a0b2881 100644 --- a/java/google/registry/reporting/icann/BUILD +++ b/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", diff --git a/java/google/registry/request/BUILD b/java/google/registry/request/BUILD index 5d8c4aa4d..1377e5483 100644 --- a/java/google/registry/request/BUILD +++ b/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", ], ) diff --git a/java/google/registry/request/auth/BUILD b/java/google/registry/request/auth/BUILD index b1a244567..9d0c493ea 100644 --- a/java/google/registry/request/auth/BUILD +++ b/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", diff --git a/java/google/registry/security/BUILD b/java/google/registry/security/BUILD index dfd01597c..a32b8f4eb 100644 --- a/java/google/registry/security/BUILD +++ b/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", diff --git a/java/google/registry/tmch/BUILD b/java/google/registry/tmch/BUILD index 77072d8c5..856c39c1b 100644 --- a/java/google/registry/tmch/BUILD +++ b/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", diff --git a/java/google/registry/tools/BUILD b/java/google/registry/tools/BUILD index 520d0b4e9..aa26fd29d 100644 --- a/java/google/registry/tools/BUILD +++ b/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", - "@com_google_appengine_remote_api//:link", + "//third_party/java/appengine:appengine-api-link", + "//third_party/java/appengine:appengine-remote-api-link", ], ) diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD index e99048217..ba8a365fa 100644 --- a/java/google/registry/tools/server/BUILD +++ b/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", diff --git a/java/google/registry/ui/BUILD b/java/google/registry/ui/BUILD index 00b0a38e0..d50135d6d 100644 --- a/java/google/registry/ui/BUILD +++ b/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", diff --git a/java/google/registry/ui/server/BUILD b/java/google/registry/ui/server/BUILD index 5948b756f..f45675f51 100644 --- a/java/google/registry/ui/server/BUILD +++ b/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", diff --git a/java/google/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD index ded0f0e32..8164dc8ef 100644 --- a/java/google/registry/ui/server/registrar/BUILD +++ b/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", diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD index 7c9034865..5dd14d5bf 100644 --- a/java/google/registry/util/BUILD +++ b/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", diff --git a/java/google/registry/whois/BUILD b/java/google/registry/whois/BUILD index 299fc69a9..32b01f247 100644 --- a/java/google/registry/whois/BUILD +++ b/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", diff --git a/javatests/google/registry/backup/BUILD b/javatests/google/registry/backup/BUILD index d962c8d02..967b6ace6 100644 --- a/javatests/google/registry/backup/BUILD +++ b/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", diff --git a/javatests/google/registry/batch/BUILD b/javatests/google/registry/batch/BUILD index ab8141fb9..6ef4ea1ea 100644 --- a/javatests/google/registry/batch/BUILD +++ b/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", diff --git a/javatests/google/registry/cron/BUILD b/javatests/google/registry/cron/BUILD index 4d9238c35..646d68abc 100644 --- a/javatests/google/registry/cron/BUILD +++ b/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", diff --git a/javatests/google/registry/dns/BUILD b/javatests/google/registry/dns/BUILD index 27ef5d80c..1b1b23fbc 100644 --- a/javatests/google/registry/dns/BUILD +++ b/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", diff --git a/javatests/google/registry/export/BUILD b/javatests/google/registry/export/BUILD index 6d85837d3..ac13dccf4 100644 --- a/javatests/google/registry/export/BUILD +++ b/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", diff --git a/javatests/google/registry/flows/BUILD b/javatests/google/registry/flows/BUILD index 515e1a7ee..e651fc6ad 100644 --- a/javatests/google/registry/flows/BUILD +++ b/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", diff --git a/javatests/google/registry/groups/BUILD b/javatests/google/registry/groups/BUILD index e80912446..0bd13684d 100644 --- a/javatests/google/registry/groups/BUILD +++ b/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", diff --git a/javatests/google/registry/mapreduce/inputs/BUILD b/javatests/google/registry/mapreduce/inputs/BUILD index 326a516ad..122fa1e76 100644 --- a/javatests/google/registry/mapreduce/inputs/BUILD +++ b/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", diff --git a/javatests/google/registry/model/BUILD b/javatests/google/registry/model/BUILD index 3da4d8c64..e6f9dbbaf 100644 --- a/javatests/google/registry/model/BUILD +++ b/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", diff --git a/javatests/google/registry/module/backend/BUILD b/javatests/google/registry/module/backend/BUILD index 164349865..ea5cf1c2b 100644 --- a/javatests/google/registry/module/backend/BUILD +++ b/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", diff --git a/javatests/google/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD index cac2f35e6..c6f578644 100644 --- a/javatests/google/registry/module/frontend/BUILD +++ b/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", diff --git a/javatests/google/registry/module/pubapi/BUILD b/javatests/google/registry/module/pubapi/BUILD index 6af438dd1..bebbe317a 100644 --- a/javatests/google/registry/module/pubapi/BUILD +++ b/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", diff --git a/javatests/google/registry/module/tools/BUILD b/javatests/google/registry/module/tools/BUILD index f2d581269..8bfe337a9 100644 --- a/javatests/google/registry/module/tools/BUILD +++ b/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", diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD index 507f3b737..fe57ab1e9 100644 --- a/javatests/google/registry/monitoring/whitebox/BUILD +++ b/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", diff --git a/javatests/google/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD index 6c94b092a..89cf0eba8 100644 --- a/javatests/google/registry/rdap/BUILD +++ b/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", diff --git a/javatests/google/registry/rde/BUILD b/javatests/google/registry/rde/BUILD index 6b40dabf9..58a3864a2 100644 --- a/javatests/google/registry/rde/BUILD +++ b/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", diff --git a/javatests/google/registry/rde/imports/BUILD b/javatests/google/registry/rde/imports/BUILD index 144e0e52d..67da9c4ba 100644 --- a/javatests/google/registry/rde/imports/BUILD +++ b/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", diff --git a/javatests/google/registry/reporting/BUILD b/javatests/google/registry/reporting/BUILD index 91ff836e0..60d253ccd 100644 --- a/javatests/google/registry/reporting/BUILD +++ b/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", diff --git a/javatests/google/registry/reporting/billing/BUILD b/javatests/google/registry/reporting/billing/BUILD index 0d0338df6..41586dcc9 100644 --- a/javatests/google/registry/reporting/billing/BUILD +++ b/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", diff --git a/javatests/google/registry/reporting/icann/BUILD b/javatests/google/registry/reporting/icann/BUILD index 8ec2884ce..53374bdaa 100644 --- a/javatests/google/registry/reporting/icann/BUILD +++ b/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", diff --git a/javatests/google/registry/request/BUILD b/javatests/google/registry/request/BUILD index 7ca55c4e5..625db96b5 100644 --- a/javatests/google/registry/request/BUILD +++ b/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", diff --git a/javatests/google/registry/request/auth/BUILD b/javatests/google/registry/request/auth/BUILD index 395133537..ae2b47f1f 100644 --- a/javatests/google/registry/request/auth/BUILD +++ b/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", ], ) diff --git a/javatests/google/registry/request/lock/BUILD b/javatests/google/registry/request/lock/BUILD index 5adb902fe..d79a591ba 100644 --- a/javatests/google/registry/request/lock/BUILD +++ b/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", ], ) diff --git a/javatests/google/registry/security/BUILD b/javatests/google/registry/security/BUILD index 3f92706cc..a800cd8dc 100644 --- a/javatests/google/registry/security/BUILD +++ b/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", - "@com_google_appengine_testing", + "//third_party/java/appengine:appengine-api-testonly", + "//third_party/java/appengine:appengine-testing", "@com_google_guava", "@com_google_truth", "@com_google_truth_extensions_truth_java8_extension", diff --git a/javatests/google/registry/server/BUILD b/javatests/google/registry/server/BUILD index 18f1bab34..476567a2a 100644 --- a/javatests/google/registry/server/BUILD +++ b/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", ], diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD index 6cf6ef968..b333eb553 100644 --- a/javatests/google/registry/testing/BUILD +++ b/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", ], ) diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD index 113551341..bfbe41f49 100644 --- a/javatests/google/registry/testing/mapreduce/BUILD +++ b/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", - "@com_google_appengine_api_stubs", - "@com_google_appengine_testing", - "@com_google_appengine_tools_appengine_mapreduce", - "@com_google_appengine_tools_appengine_pipeline", + "//third_party/java/appengine:appengine-api", + "//third_party/java/appengine:appengine-stubs", + "//third_party/java/appengine:appengine-testing", + "//third_party/java/appengine_mapreduce2:appengine_mapreduce", + "//third_party/java/appengine_pipeline", "@com_google_code_findbugs_jsr305", "@com_google_flogger", "@com_google_flogger_system_backend", diff --git a/javatests/google/registry/tmch/BUILD b/javatests/google/registry/tmch/BUILD index 1de3d9e42..0e779bd6e 100644 --- a/javatests/google/registry/tmch/BUILD +++ b/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", diff --git a/javatests/google/registry/tools/BUILD b/javatests/google/registry/tools/BUILD index 6bd581e18..3e35916af 100644 --- a/javatests/google/registry/tools/BUILD +++ b/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", diff --git a/javatests/google/registry/tools/server/BUILD b/javatests/google/registry/tools/server/BUILD index 8f048d16d..134f5252c 100644 --- a/javatests/google/registry/tools/server/BUILD +++ b/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", diff --git a/javatests/google/registry/ui/server/registrar/BUILD b/javatests/google/registry/ui/server/registrar/BUILD index a2d3b207d..89d1cad09 100644 --- a/javatests/google/registry/ui/server/registrar/BUILD +++ b/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", diff --git a/javatests/google/registry/util/BUILD b/javatests/google/registry/util/BUILD index 527877caa..fdfc0e7ca 100644 --- a/javatests/google/registry/util/BUILD +++ b/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", diff --git a/javatests/google/registry/whois/BUILD b/javatests/google/registry/whois/BUILD index 07f4fa62b..08fbfa4b5 100644 --- a/javatests/google/registry/whois/BUILD +++ b/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",