From 4c7bc3b18c9df6bb62697868b8418870a6932b2d Mon Sep 17 00:00:00 2001 From: mcilwain Date: Mon, 25 Jun 2018 14:12:16 -0700 Subject: [PATCH] Improve internal build system speed ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=202016862 --- java/google/registry/backup/BUILD | 6 +++--- java/google/registry/batch/BUILD | 8 ++++---- java/google/registry/bigquery/BUILD | 4 ++-- java/google/registry/config/BUILD | 2 +- java/google/registry/cron/BUILD | 2 +- java/google/registry/dns/BUILD | 2 +- java/google/registry/export/BUILD | 6 +++--- java/google/registry/export/sheet/BUILD | 2 +- java/google/registry/flows/BUILD | 2 +- java/google/registry/gcs/BUILD | 2 +- java/google/registry/loadtest/BUILD | 2 +- java/google/registry/mapreduce/BUILD | 6 +++--- java/google/registry/mapreduce/inputs/BUILD | 6 +++--- java/google/registry/model/BUILD | 2 +- java/google/registry/module/backend/BUILD | 2 +- java/google/registry/module/frontend/BUILD | 2 +- java/google/registry/module/pubapi/BUILD | 2 +- java/google/registry/module/tools/BUILD | 2 +- java/google/registry/monitoring/whitebox/BUILD | 2 +- java/google/registry/rde/BUILD | 6 +++--- java/google/registry/rde/imports/BUILD | 6 +++--- java/google/registry/reporting/billing/BUILD | 6 +++--- java/google/registry/reporting/icann/BUILD | 4 ++-- java/google/registry/request/BUILD | 8 ++++---- java/google/registry/request/auth/BUILD | 2 +- java/google/registry/security/BUILD | 2 +- java/google/registry/tmch/BUILD | 2 +- java/google/registry/tools/BUILD | 16 ++++++++-------- java/google/registry/tools/server/BUILD | 8 ++++---- java/google/registry/ui/BUILD | 2 +- java/google/registry/ui/server/BUILD | 2 +- java/google/registry/ui/server/registrar/BUILD | 2 +- java/google/registry/util/BUILD | 2 +- java/google/registry/whois/BUILD | 2 +- javatests/google/registry/backup/BUILD | 4 ++-- javatests/google/registry/batch/BUILD | 10 +++++----- javatests/google/registry/cron/BUILD | 6 +++--- javatests/google/registry/dns/BUILD | 4 ++-- javatests/google/registry/export/BUILD | 6 +++--- javatests/google/registry/flows/BUILD | 4 ++-- javatests/google/registry/groups/BUILD | 6 +++--- javatests/google/registry/mapreduce/inputs/BUILD | 6 +++--- javatests/google/registry/model/BUILD | 4 ++-- javatests/google/registry/module/backend/BUILD | 2 +- javatests/google/registry/module/frontend/BUILD | 2 +- javatests/google/registry/module/pubapi/BUILD | 2 +- javatests/google/registry/module/tools/BUILD | 2 +- .../google/registry/monitoring/whitebox/BUILD | 6 +++--- javatests/google/registry/rdap/BUILD | 2 +- javatests/google/registry/rde/BUILD | 4 ++-- javatests/google/registry/rde/imports/BUILD | 4 ++-- javatests/google/registry/reporting/BUILD | 4 ++-- .../google/registry/reporting/billing/BUILD | 4 ++-- javatests/google/registry/reporting/icann/BUILD | 4 ++-- javatests/google/registry/request/BUILD | 2 +- javatests/google/registry/request/auth/BUILD | 6 +++--- javatests/google/registry/request/lock/BUILD | 6 +++--- javatests/google/registry/security/BUILD | 4 ++-- javatests/google/registry/server/BUILD | 5 +++-- javatests/google/registry/testing/BUILD | 10 +++++----- .../google/registry/testing/mapreduce/BUILD | 10 +++++----- javatests/google/registry/tmch/BUILD | 2 +- javatests/google/registry/tools/BUILD | 4 ++-- javatests/google/registry/tools/server/BUILD | 8 ++++---- .../google/registry/ui/server/registrar/BUILD | 2 +- javatests/google/registry/util/BUILD | 2 +- javatests/google/registry/whois/BUILD | 4 ++-- 67 files changed, 142 insertions(+), 141 deletions(-) diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD index 437f07638..b4e7a1574 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 da30d5633..f8da2463b 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 b7aeb89a5..c3d83d201 100644 --- a/java/google/registry/bigquery/BUILD +++ b/java/google/registry/bigquery/BUILD @@ -8,11 +8,10 @@ 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", @@ -20,6 +19,7 @@ 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 bb033d7b1..7f1e7b6bc 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", - "//third_party/java/appengine:appengine-api", + "@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/cron/BUILD b/java/google/registry/cron/BUILD index 7e7a34f27..7af90fd21 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 be3ad6e68..69b101681 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/export/BUILD b/java/google/registry/export/BUILD index 5dc8a73e4..b1bf9a48f 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 8221eac6b..d0135a694 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 213949cb0..06adb214f 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 c524c4b0c..7ab141051 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", - "//third_party/java/appengine_gcs_client", + "@com_google_appengine_tools_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 74d11c176..dbd503dfa 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 456df1cca..6a79a76cb 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 d81eeebae..8ef99729b 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 2e4fadce6..bce68a9e3 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 09b67c175..d0a4ed1cb 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", - "//third_party/java/appengine:appengine-api", + "@com_google_appengine_api_1_0_sdk", "@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 217a3ceac..b79a8db06 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", - "//third_party/java/appengine:appengine-api", + "@com_google_appengine_api_1_0_sdk", "@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 e70f0cf97..2c9573e58 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", - "//third_party/java/appengine:appengine-api", + "@com_google_appengine_api_1_0_sdk", "@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 0701e421f..17215d63a 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", - "//third_party/java/appengine:appengine-api", + "@com_google_appengine_api_1_0_sdk", "@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 6d92c88c6..10c93d0d8 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 db28b077a..cb5682b2b 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 dd25bfe8c..52b68cd80 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 c7afa7a8b..3d60662e7 100644 --- a/java/google/registry/reporting/billing/BUILD +++ b/java/google/registry/reporting/billing/BUILD @@ -11,7 +11,6 @@ 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", @@ -20,9 +19,10 @@ 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", + "@com_google_api_client_appengine", "@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 82a0b2881..8435205e1 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 1377e5483..5d8c4aa4d 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", - "//third_party/java/appengine:appengine-api", + "@com_google_appengine_api_1_0_sdk", "@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 9d0c493ea..b1a244567 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", - "//third_party/java/appengine:appengine-api", + "@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/security/BUILD b/java/google/registry/security/BUILD index a32b8f4eb..dfd01597c 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 856c39c1b..77072d8c5 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 aa26fd29d..4c89faeb5 100644 --- a/java/google/registry/tools/BUILD +++ b/java/google/registry/tools/BUILD @@ -4,9 +4,9 @@ package( licenses(["notice"]) # Apache 2.0 -# Restrict visibility to :tools because :remoteapi-internal (and transitively -# :appengine-api-link) should never be linked into an App Engine deploy jar, -# since the App Engine API is provided by the runtime environment. +# Restrict visibility to :tools because :remoteapi-internal should never be +# linked into an App Engine deploy jar, since the App Engine API is provided by +# the runtime environment. package_group( name = "allowed-tools", packages = [ @@ -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", - "//third_party/java/appengine:appengine-api-link", - "//third_party/java/appengine:appengine-remote-api-link", + "@com_google_appengine_api_1_0_sdk//:link", + "@com_google_appengine_remote_api//:link", ], ) diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD index ba8a365fa..e99048217 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 d50135d6d..00b0a38e0 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", - "//third_party/java/appengine:appengine-api", + "@com_google_appengine_api_1_0_sdk", "@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 f45675f51..5948b756f 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", - "//third_party/java/appengine:appengine-api", + "@com_google_appengine_api_1_0_sdk", "@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 8164dc8ef..ded0f0e32 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 5dd14d5bf..7c9034865 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 32b01f247..299fc69a9 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 967b6ace6..7a0b8eaef 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", + "@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 1836ebbcd..b3aa19e0c 100644 --- a/javatests/google/registry/batch/BUILD +++ b/javatests/google/registry/batch/BUILD @@ -21,13 +21,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", + "@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 646d68abc..75258463a 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", + "@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 1b1b23fbc..424ee9dd6 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", + "@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 ac13dccf4..9fd6c43ca 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", + "@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 e651fc6ad..f4872c0dd 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", + "@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 0bd13684d..598e0224f 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", + "@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 122fa1e76..01b1e26ee 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", + "@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 e6f9dbbaf..196f0fcb4 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", + "@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 ea5cf1c2b..164349865 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. - "//third_party/java/appengine:appengine-api-testonly", + "@com_google_appengine_api_1_0_sdk//:testonly", ], deps = [ "//java/google/registry/module/backend", diff --git a/javatests/google/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD index c6f578644..cac2f35e6 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. - "//third_party/java/appengine:appengine-api-testonly", + "@com_google_appengine_api_1_0_sdk//:testonly", ], deps = [ "//java/google/registry/module/frontend", diff --git a/javatests/google/registry/module/pubapi/BUILD b/javatests/google/registry/module/pubapi/BUILD index bebbe317a..6af438dd1 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. - "//third_party/java/appengine:appengine-api-testonly", + "@com_google_appengine_api_1_0_sdk//:testonly", ], deps = [ "//java/google/registry/module/pubapi", diff --git a/javatests/google/registry/module/tools/BUILD b/javatests/google/registry/module/tools/BUILD index 8bfe337a9..f2d581269 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. - "//third_party/java/appengine:appengine-api-testonly", + "@com_google_appengine_api_1_0_sdk//:testonly", ], deps = [ "//java/google/registry/module/tools", diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD index fe57ab1e9..d589e2c86 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", + "@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 89cf0eba8..cbef7370d 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", "@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 58a3864a2..0bdd6ead6 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", + "@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 67da9c4ba..50e8c8696 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", + "@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 60d253ccd..91ff836e0 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 41586dcc9..0d0338df6 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 53374bdaa..8ec2884ce 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 625db96b5..daff4d0f2 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", - "//third_party/java/appengine:appengine-api-testonly", + "@com_google_appengine_api_1_0_sdk", "@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 ae2b47f1f..1a6621caf 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", + "@com_google_appengine_tools_appengine_gcs_client", + "@com_google_appengine_tools_sdk", "@com_google_code_findbugs_jsr305", "@com_google_guava", "@com_google_truth", diff --git a/javatests/google/registry/request/lock/BUILD b/javatests/google/registry/request/lock/BUILD index 528fdd5f7..4c8c726df 100644 --- a/javatests/google/registry/request/lock/BUILD +++ b/javatests/google/registry/request/lock/BUILD @@ -16,10 +16,10 @@ 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-integration-testing", - "//third_party/java/appengine_gcs_client", "//third_party/objectify:objectify-v4_1", + "@com_google_appengine_api_1_0_sdk", + "@com_google_appengine_tools_appengine_gcs_client", + "@com_google_appengine_tools_sdk", "@com_google_code_findbugs_jsr305", "@com_google_guava", "@com_google_truth", diff --git a/javatests/google/registry/security/BUILD b/javatests/google/registry/security/BUILD index a800cd8dc..0250a9379 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", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/appengine:appengine-testing", + "@com_google_appengine_api_1_0_sdk", + "@com_google_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 476567a2a..18f1bab34 100644 --- a/javatests/google/registry/server/BUILD +++ b/javatests/google/registry/server/BUILD @@ -18,13 +18,14 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/google/registry/util", - "//third_party/java/appengine:appengine-integration-testing", + "@com_google_appengine_tools_sdk", "@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", ], ) @@ -34,8 +35,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 b333eb553..af462a282 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", + "@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", diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD index bfbe41f49..113551341 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", - "//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_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", "@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 0e779bd6e..a6eaaf27e 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", "@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 3e35916af..ab0311c5a 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", + "@com_google_appengine_remote_api", "@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 134f5252c..566c170d4 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", + "@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 89d1cad09..088eeef3e 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", "@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 fdfc0e7ca..527877caa 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", - "//third_party/java/appengine:appengine-api", + "@com_google_appengine_api_1_0_sdk", "@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 08fbfa4b5..07f4fa62b 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",