From 28f6c770c841039d38b3329d4f6deb5b7bf72e40 Mon Sep 17 00:00:00 2001 From: mcilwain Date: Mon, 19 Dec 2016 08:28:32 -0800 Subject: [PATCH] Add MOE equivalence for sync on 2016-12-19 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=142449539 --- java/google/registry/backup/BUILD | 23 ++++----- java/google/registry/batch/BUILD | 36 ++++++------- java/google/registry/bigquery/BUILD | 28 ++++------ java/google/registry/braintree/BUILD | 10 ++-- java/google/registry/config/BUILD | 17 +++---- java/google/registry/cron/BUILD | 17 +++---- java/google/registry/dns/BUILD | 21 +++----- java/google/registry/dns/writer/BUILD | 6 +-- .../google/registry/dns/writer/clouddns/BUILD | 17 +++---- .../registry/dns/writer/dnsupdate/BUILD | 17 +++---- java/google/registry/eclipse/BUILD | 28 +++++----- java/google/registry/export/BUILD | 40 +++++++-------- java/google/registry/export/sheet/BUILD | 22 ++++---- java/google/registry/flows/BUILD | 25 ++++----- java/google/registry/gcs/BUILD | 12 ++--- java/google/registry/groups/BUILD | 19 +++---- java/google/registry/keyring/api/BUILD | 11 ++-- java/google/registry/loadtest/BUILD | 14 +++-- java/google/registry/mapreduce/BUILD | 18 +++---- java/google/registry/mapreduce/inputs/BUILD | 18 +++---- java/google/registry/model/BUILD | 28 ++++------ java/google/registry/module/backend/BUILD | 19 +++---- java/google/registry/module/frontend/BUILD | 15 +++--- java/google/registry/module/tools/BUILD | 15 +++--- java/google/registry/monitoring/metrics/BUILD | 31 +++++------ .../google/registry/monitoring/whitebox/BUILD | 27 ++++------ java/google/registry/pricing/BUILD | 19 +++---- java/google/registry/rdap/BUILD | 24 ++++----- java/google/registry/rde/BUILD | 34 +++++-------- java/google/registry/rde/imports/BUILD | 28 ++++------ java/google/registry/request/BUILD | 41 +++++++-------- java/google/registry/security/BUILD | 17 +++---- java/google/registry/storage/drive/BUILD | 19 +++---- java/google/registry/tldconfig/idn/BUILD | 13 ++--- java/google/registry/tmch/BUILD | 25 ++++----- java/google/registry/tools/BUILD | 51 ++++++++----------- java/google/registry/tools/params/BUILD | 16 +++--- java/google/registry/tools/server/BUILD | 28 ++++------ .../registry/tools/server/javascrap/BUILD | 16 +++--- java/google/registry/ui/BUILD | 8 +-- java/google/registry/ui/forms/BUILD | 8 ++- java/google/registry/ui/server/BUILD | 17 +++---- .../google/registry/ui/server/registrar/BUILD | 22 ++++---- java/google/registry/util/BUILD | 28 ++++------ java/google/registry/whois/BUILD | 19 +++---- java/google/registry/xjc/BUILD | 12 ++--- java/google/registry/xml/BUILD | 10 ++-- javatests/google/registry/backup/BUILD | 22 ++++---- javatests/google/registry/batch/BUILD | 34 ++++++------- javatests/google/registry/bigquery/BUILD | 17 +++---- javatests/google/registry/config/BUILD | 6 +-- javatests/google/registry/cron/BUILD | 15 +++--- javatests/google/registry/dns/BUILD | 24 ++++----- .../google/registry/dns/writer/clouddns/BUILD | 22 ++++---- .../registry/dns/writer/dnsupdate/BUILD | 23 ++++----- javatests/google/registry/export/BUILD | 34 ++++++------- javatests/google/registry/export/sheet/BUILD | 18 +++---- javatests/google/registry/flows/BUILD | 32 +++++------- javatests/google/registry/groups/BUILD | 31 +++++------ .../google/registry/mapreduce/inputs/BUILD | 17 +++---- javatests/google/registry/model/BUILD | 23 ++++----- .../google/registry/module/backend/BUILD | 10 ++-- .../google/registry/module/frontend/BUILD | 10 ++-- javatests/google/registry/module/tools/BUILD | 10 ++-- .../google/registry/monitoring/metrics/BUILD | 20 ++++---- .../google/registry/monitoring/whitebox/BUILD | 32 +++++------- javatests/google/registry/pricing/BUILD | 15 +++--- javatests/google/registry/rdap/BUILD | 23 ++++----- javatests/google/registry/rde/BUILD | 35 ++++++------- javatests/google/registry/rde/imports/BUILD | 23 ++++----- javatests/google/registry/request/BUILD | 22 ++++---- javatests/google/registry/security/BUILD | 20 ++++---- javatests/google/registry/server/BUILD | 34 +++++-------- javatests/google/registry/storage/drive/BUILD | 14 +++-- javatests/google/registry/testing/BUILD | 46 ++++++++--------- .../google/registry/testing/mapreduce/BUILD | 25 +++++---- javatests/google/registry/testing/sftp/BUILD | 15 +++--- javatests/google/registry/tldconfig/idn/BUILD | 7 ++- javatests/google/registry/tmch/BUILD | 23 ++++----- javatests/google/registry/tools/BUILD | 31 +++++------ javatests/google/registry/tools/params/BUILD | 15 +++--- javatests/google/registry/tools/server/BUILD | 23 ++++----- javatests/google/registry/ui/forms/BUILD | 15 +++--- javatests/google/registry/ui/server/BUILD | 6 +-- .../google/registry/ui/server/registrar/BUILD | 25 ++++----- javatests/google/registry/util/BUILD | 22 ++++---- javatests/google/registry/whois/BUILD | 19 +++---- javatests/google/registry/xjc/BUILD | 10 ++-- javatests/google/registry/xml/BUILD | 14 +++-- third_party/java/appengine_mapreduce2/BUILD | 8 +-- third_party/java/appengine_pipeline/BUILD | 4 +- third_party/java/auto/BUILD | 2 +- third_party/java/dagger/BUILD | 10 ++-- third_party/java/objectify/v4_1/BUILD | 4 +- 94 files changed, 804 insertions(+), 1095 deletions(-) diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD index 361babfa1..f511143a0 100644 --- a/java/google/registry/backup/BUILD +++ b/java/google/registry/backup/BUILD @@ -8,25 +8,20 @@ java_library( name = "backup", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//java/com/google/common/primitives", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", "//java/google/registry/cron", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/appengine_gcs_client", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@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", + "@com_googlecode_json_simple", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/batch/BUILD b/java/google/registry/batch/BUILD index f7cb46eef..7911dde2d 100644 --- a/java/google/registry/batch/BUILD +++ b/java/google/registry/batch/BUILD @@ -8,15 +8,6 @@ java_library( name = "batch", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//java/com/google/api/client/util", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/math", - "//java/com/google/common/net", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/dns", @@ -29,18 +20,21 @@ java_library( "//java/google/registry/request", "//java/google/registry/request:modules", "//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/auto:auto_factory", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@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_auto_factory", + "@com_google_auto_value", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_http_client", + "@com_googlecode_json_simple", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@org_joda_money", ], ) diff --git a/java/google/registry/bigquery/BUILD b/java/google/registry/bigquery/BUILD index 019b27929..8a5b7ce50 100644 --- a/java/google/registry/bigquery/BUILD +++ b/java/google/registry/bigquery/BUILD @@ -8,25 +8,19 @@ java_library( name = "bigquery", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//java/com/google/api/client/extensions/appengine/http", - "//java/com/google/api/client/googleapis/auth/oauth2", - "//java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2", - "//java/com/google/api/client/googleapis/json", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/api/client/json/jackson2", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", + "@com_google_api_client", + "@com_google_api_client_appengine", + "@com_google_apis_google_api_services_bigquery", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_http_client", + "@com_google_http_client_appengine", + "@com_google_http_client_jackson2", + "@javax_inject", + "@joda_time", ], ) diff --git a/java/google/registry/braintree/BUILD b/java/google/registry/braintree/BUILD index 4b262e6b9..116cefbb3 100644 --- a/java/google/registry/braintree/BUILD +++ b/java/google/registry/braintree/BUILD @@ -8,13 +8,13 @@ java_library( name = "braintree", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", "//java/google/registry/config", "//java/google/registry/keyring/api", "//java/google/registry/model", - "//third_party/java/braintree", - "//third_party/java/dagger", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", + "@com_braintreepayments_gateway_braintree_java", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", ], ) diff --git a/java/google/registry/config/BUILD b/java/google/registry/config/BUILD index 7ec170a29..085fef94d 100644 --- a/java/google/registry/config/BUILD +++ b/java/google/registry/config/BUILD @@ -8,15 +8,12 @@ java_library( name = "config", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//third_party/java/appengine:appengine-api", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", + "@com_google_appengine_api_1_0_sdk", + "@com_google_auto_value", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@joda_time", + "@org_joda_money", ], ) diff --git a/java/google/registry/cron/BUILD b/java/google/registry/cron/BUILD index a24c80766..196414dc0 100644 --- a/java/google/registry/cron/BUILD +++ b/java/google/registry/cron/BUILD @@ -8,19 +8,16 @@ java_library( name = "cron", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/dns/BUILD b/java/google/registry/dns/BUILD index 3260237cf..2e086bbd6 100644 --- a/java/google/registry/dns/BUILD +++ b/java/google/registry/dns/BUILD @@ -20,25 +20,20 @@ java_library( ), deps = [ ":constants", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/dns/writer", "//java/google/registry/model", "//java/google/registry/monitoring/metrics", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_auto_value", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/dns/writer/BUILD b/java/google/registry/dns/writer/BUILD index 7b6887b4d..03ce3ab78 100644 --- a/java/google/registry/dns/writer/BUILD +++ b/java/google/registry/dns/writer/BUILD @@ -8,9 +8,7 @@ java_library( name = "writer", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//third_party/java/dagger", + "@com_google_dagger", + "@com_google_guava", ], ) diff --git a/java/google/registry/dns/writer/clouddns/BUILD b/java/google/registry/dns/writer/clouddns/BUILD index 4e74dc6f9..036b5cd4f 100644 --- a/java/google/registry/dns/writer/clouddns/BUILD +++ b/java/google/registry/dns/writer/clouddns/BUILD @@ -8,20 +8,15 @@ java_library( name = "clouddns", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/cloud/dns:cloud_dns_v2beta1_versioned", - "//java/com/google/api/client/googleapis/json", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", "//java/google/registry/dns/writer", "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/dagger", - "//third_party/java/joda_time", + "@com_google_api_client", + "@com_google_apis_google_api_services_dns", + "@com_google_dagger", + "@com_google_guava", + "@com_google_http_client", + "@joda_time", ], ) diff --git a/java/google/registry/dns/writer/dnsupdate/BUILD b/java/google/registry/dns/writer/dnsupdate/BUILD index e09552d2f..9d196a060 100644 --- a/java/google/registry/dns/writer/dnsupdate/BUILD +++ b/java/google/registry/dns/writer/dnsupdate/BUILD @@ -8,20 +8,15 @@ java_library( name = "dnsupdate", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/primitives", "//java/google/registry/config", "//java/google/registry/dns/writer", "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/dagger", - "//third_party/java/dnsjava", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@dnsjava", + "@javax_inject", + "@joda_time", ], ) diff --git a/java/google/registry/eclipse/BUILD b/java/google/registry/eclipse/BUILD index ae53d9add..6e2bbb155 100644 --- a/java/google/registry/eclipse/BUILD +++ b/java/google/registry/eclipse/BUILD @@ -8,10 +8,10 @@ java_binary( name = "annotation_processors_ide", create_executable = False, runtime_deps = [ - "//third_party/java/dagger:dagger-compiler", "@auto_factory//jar", "@auto_service//jar", "@auto_value//jar", + "@com_google_dagger_compiler", "@javawriter//jar", ], ) @@ -21,23 +21,23 @@ java_binary( testonly = 1, create_executable = 0, runtime_deps = [ - "//java/com/google/common/testing", "//java/google/registry/module/backend", "//java/google/registry/module/frontend", "//java/google/registry/module/tools", "//java/google/registry/tools", - "//third_party/java/apache_sshd", - "//third_party/java/appengine:appengine-api-link", - "//third_party/java/appengine:appengine-integration-testing", - "//third_party/java/appengine:appengine-remote-api-link", - "//third_party/java/appengine:appengine-stubs", - "//third_party/java/appengine:appengine-testing", - "//third_party/java/ftpserver", - "//third_party/java/hamcrest", - "//third_party/java/jetty/v6_1_22", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:link", + "@com_google_appengine_api_stubs", + "@com_google_appengine_remote_api//:link", + "@com_google_appengine_testing", + "@com_google_appengine_tools_sdk", + "@com_google_guava_testlib", + "@com_google_truth", + "@junit", + "@org_apache_ftpserver_core", + "@org_apache_sshd_core", + "@org_hamcrest_library", + "@org_mockito_all", + "@org_mortbay_jetty", ], ) diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD index 9359adea4..cabc9dba4 100644 --- a/java/google/registry/export/BUILD +++ b/java/google/registry/export/BUILD @@ -8,20 +8,6 @@ java_library( name = "export", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//apiserving/discoverydata/drive", - "//java/com/google/api/client/extensions/appengine/http", - "//java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2", - "//java/com/google/api/client/googleapis/json", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/api/client/json/jackson2", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/gcs", @@ -32,15 +18,23 @@ java_library( "//java/google/registry/request", "//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/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_api_client", + "@com_google_api_client_appengine", + "@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_guava", + "@com_google_http_client", + "@com_google_http_client_appengine", + "@com_google_http_client_jackson2", + "@com_googlecode_json_simple", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/export/sheet/BUILD b/java/google/registry/export/sheet/BUILD index 6a28ea7ad..bffc71371 100644 --- a/java/google/registry/export/sheet/BUILD +++ b/java/google/registry/export/sheet/BUILD @@ -8,23 +8,19 @@ java_library( name = "sheet", srcs = glob(["*.java"]), deps = [ - "//java/com/google/api/client/googleapis/auth/oauth2", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/gdata", - "//java/com/google/gdata:spreadsheet", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_api_client", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_gdata_core", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/flows/BUILD b/java/google/registry/flows/BUILD index 3fba7a312..e1cb5db05 100644 --- a/java/google/registry/flows/BUILD +++ b/java/google/registry/flows/BUILD @@ -23,12 +23,6 @@ java_library( visibility = ["//visibility:public"], deps = [ ":soy_java_wrappers", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/math", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/model", @@ -40,17 +34,18 @@ java_library( "//java/google/registry/tmch", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/appengine:appengine-api", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_auto_value", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_googlecode_json_simple", "@io_bazel_rules_closure//closure/templates", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@org_joda_money", ], ) diff --git a/java/google/registry/gcs/BUILD b/java/google/registry/gcs/BUILD index 5861959c6..775d9e7a2 100644 --- a/java/google/registry/gcs/BUILD +++ b/java/google/registry/gcs/BUILD @@ -8,14 +8,12 @@ java_library( name = "gcs", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/util", - "//third_party/java/appengine_gcs_client", - "//third_party/java/dagger", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", + "@com_google_appengine_tools_appengine_gcs_client", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", ], ) diff --git a/java/google/registry/groups/BUILD b/java/google/registry/groups/BUILD index 1ae7aabcd..d860a2644 100644 --- a/java/google/registry/groups/BUILD +++ b/java/google/registry/groups/BUILD @@ -8,19 +8,16 @@ java_library( name = "groups", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/admin:admin_directory_v1", - "//apiserving/discoverydata/groupssettings", - "//java/com/google/api/client/googleapis/auth/oauth2", - "//java/com/google/api/client/googleapis/json", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/config", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/servlet/servlet_api", + "@com_google_api_client", + "@com_google_apis_google_api_services_admin_directory", + "@com_google_apis_google_api_services_groupssettings", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/keyring/api/BUILD b/java/google/registry/keyring/api/BUILD index a031654e7..56fa9c4d9 100644 --- a/java/google/registry/keyring/api/BUILD +++ b/java/google/registry/keyring/api/BUILD @@ -9,11 +9,10 @@ java_library( srcs = glob(["*.java"]), resources = glob(["*.asc"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/io", - "//third_party/java/bouncycastle", - "//third_party/java/bouncycastle_bcpg", - "//third_party/java/dagger", - "//third_party/java/jsr305_annotations", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@org_bouncycastle_bcpg_jdk15on", + "@org_bouncycastle_bcpkix_jdk15on", ], ) diff --git a/java/google/registry/loadtest/BUILD b/java/google/registry/loadtest/BUILD index 78ac1668a..30388d794 100644 --- a/java/google/registry/loadtest/BUILD +++ b/java/google/registry/loadtest/BUILD @@ -9,18 +9,16 @@ java_library( srcs = glob(["*.java"]), resources = glob(["templates/*.xml"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/request", "//java/google/registry/security", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/mapreduce/BUILD b/java/google/registry/mapreduce/BUILD index cb55d073a..ef00930d0 100644 --- a/java/google/registry/mapreduce/BUILD +++ b/java/google/registry/mapreduce/BUILD @@ -8,20 +8,18 @@ java_library( name = "mapreduce", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/mapreduce/inputs", "//java/google/registry/model", "//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/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_appengine_tools_appengine_mapreduce", + "@com_google_appengine_tools_appengine_pipeline", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD index 0466d2f9f..aef677c65 100644 --- a/java/google/registry/mapreduce/inputs/BUILD +++ b/java/google/registry/mapreduce/inputs/BUILD @@ -8,18 +8,16 @@ java_library( name = "inputs", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", "//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/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_appengine_tools_appengine_mapreduce", + "@com_google_appengine_tools_appengine_pipeline", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/model/BUILD b/java/google/registry/model/BUILD index bb1825e69..c9f988bc1 100644 --- a/java/google/registry/model/BUILD +++ b/java/google/registry/model/BUILD @@ -13,28 +13,18 @@ java_library( ]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/cache", - "//java/com/google/common/collect", - "//java/com/google/common/hash", - "//java/com/google/common/io", - "//java/com/google/common/math", - "//java/com/google/common/net", - "//java/com/google/common/primitives", - "//java/com/google/common/reflect", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_re2j", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@org_joda_money", ], ) diff --git a/java/google/registry/module/backend/BUILD b/java/google/registry/module/backend/BUILD index ec1da65d5..1bfb3da87 100644 --- a/java/google/registry/module/backend/BUILD +++ b/java/google/registry/module/backend/BUILD @@ -8,10 +8,6 @@ java_library( name = "backend", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//java/google/registry/backup", "//java/google/registry/batch", "//java/google/registry/bigquery", @@ -37,13 +33,14 @@ java_library( "//java/google/registry/request:modules", "//java/google/registry/tmch", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/bouncycastle", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@org_bouncycastle_bcpkix_jdk15on", ], ) diff --git a/java/google/registry/module/frontend/BUILD b/java/google/registry/module/frontend/BUILD index d6906c409..618063bf2 100644 --- a/java/google/registry/module/frontend/BUILD +++ b/java/google/registry/module/frontend/BUILD @@ -8,8 +8,6 @@ java_library( name = "frontend", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/braintree", "//java/google/registry/config", "//java/google/registry/dns", @@ -24,12 +22,13 @@ java_library( "//java/google/registry/ui/server/registrar", "//java/google/registry/util", "//java/google/registry/whois", - "//third_party/java/appengine:appengine-api", - "//third_party/java/bouncycastle", - "//third_party/java/dagger", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@org_bouncycastle_bcpkix_jdk15on", ], ) diff --git a/java/google/registry/module/tools/BUILD b/java/google/registry/module/tools/BUILD index d85caa0e8..ea554ebb8 100644 --- a/java/google/registry/module/tools/BUILD +++ b/java/google/registry/module/tools/BUILD @@ -8,8 +8,6 @@ java_library( name = "tools", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/export", @@ -25,12 +23,13 @@ java_library( "//java/google/registry/tools/server", "//java/google/registry/tools/server/javascrap", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/bouncycastle", - "//third_party/java/dagger", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@org_bouncycastle_bcpkix_jdk15on", ], ) diff --git a/java/google/registry/monitoring/metrics/BUILD b/java/google/registry/monitoring/metrics/BUILD index 6750d0f0b..8395e6b7b 100644 --- a/java/google/registry/monitoring/metrics/BUILD +++ b/java/google/registry/monitoring/metrics/BUILD @@ -8,24 +8,17 @@ java_library( name = "metrics", srcs = glob(["*.java"]), deps = [ - "//google/monitoring:monitoring_java_lib", - "//java/com/google/api/client/googleapis/json", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/math", - "//java/com/google/common/primitives", - "//java/com/google/common/util/concurrent", - "//third_party/java/appengine:appengine-api", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/error_prone:annotations", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/re2j", + "@com_google_api_client", + "@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", + "@com_google_errorprone_error_prone_annotations", + "@com_google_guava", + "@com_google_http_client", + "@com_google_re2j", + "@javax_inject", + "@joda_time", ], ) diff --git a/java/google/registry/monitoring/whitebox/BUILD b/java/google/registry/monitoring/whitebox/BUILD index 253735c15..353c6ceb2 100644 --- a/java/google/registry/monitoring/whitebox/BUILD +++ b/java/google/registry/monitoring/whitebox/BUILD @@ -8,28 +8,23 @@ java_library( name = "whitebox", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//google/monitoring:monitoring_java_lib", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/cache", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/monitoring/metrics", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@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", + "@com_google_guava", + "@com_google_http_client", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/pricing/BUILD b/java/google/registry/pricing/BUILD index 26f421c1f..d5569852a 100644 --- a/java/google/registry/pricing/BUILD +++ b/java/google/registry/pricing/BUILD @@ -8,20 +8,15 @@ java_library( name = "pricing", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/util/concurrent", "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/dagger", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@org_joda_money", ], ) diff --git a/java/google/registry/rdap/BUILD b/java/google/registry/rdap/BUILD index c75b289e4..8f6b92017 100644 --- a/java/google/registry/rdap/BUILD +++ b/java/google/registry/rdap/BUILD @@ -8,25 +8,19 @@ java_library( name = "rdap", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/primitives", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", + "@com_google_auto_value", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_re2j", + "@com_googlecode_json_simple", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/rde/BUILD b/java/google/registry/rde/BUILD index 804183c1d..2b7738b6d 100644 --- a/java/google/registry/rde/BUILD +++ b/java/google/registry/rde/BUILD @@ -8,13 +8,6 @@ java_library( name = "rde", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/math", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/gcs", "//java/google/registry/keyring/api", @@ -26,20 +19,21 @@ 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/java/auto:auto_factory", - "//third_party/java/auto:auto_value", - "//third_party/java/bouncycastle", - "//third_party/java/bouncycastle_bcpg", - "//third_party/java/dagger", - "//third_party/java/joda_time", "//third_party/java/jsch", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", + "@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", + "@com_google_dagger", + "@com_google_guava", + "@com_google_re2j", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@org_bouncycastle_bcpg_jdk15on", + "@org_bouncycastle_bcpkix_jdk15on", ], ) diff --git a/java/google/registry/rde/imports/BUILD b/java/google/registry/rde/imports/BUILD index 3bb667eff..37ccacd78 100644 --- a/java/google/registry/rde/imports/BUILD +++ b/java/google/registry/rde/imports/BUILD @@ -8,13 +8,6 @@ java_library( name = "imports", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/math", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/gcs", "//java/google/registry/mapreduce", @@ -22,16 +15,17 @@ java_library( "//java/google/registry/request", "//java/google/registry/util", "//java/google/registry/xjc", - "//third_party/java/appengine:appengine-api", - "//third_party/java/appengine_gcs_client", - "//third_party/java/appengine_mapreduce2:appengine_mapreduce", - "//third_party/java/auto:auto_factory", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@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", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/request/BUILD b/java/google/registry/request/BUILD index 2fbe58e28..c59141873 100644 --- a/java/google/registry/request/BUILD +++ b/java/google/registry/request/BUILD @@ -11,22 +11,17 @@ java_library( exclude = ["Modules.java"], ), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/security", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/auto:auto_value", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_auto_value", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_googlecode_json_simple", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) @@ -34,17 +29,15 @@ java_library( name = "modules", srcs = ["Modules.java"], deps = [ - "//java/com/google/api/client/extensions/appengine/http", - "//java/com/google/api/client/googleapis/auth/oauth2", - "//java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/api/client/json/jackson2", - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/config", "//java/google/registry/keyring/api", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", + "@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/security/BUILD b/java/google/registry/security/BUILD index 2294542c8..a2c54aed3 100644 --- a/java/google/registry/security/BUILD +++ b/java/google/registry/security/BUILD @@ -11,19 +11,14 @@ java_library( exclude = glob(["*Servlet.java"]), ), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/hash", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_googlecode_json_simple", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/storage/drive/BUILD b/java/google/registry/storage/drive/BUILD index b5f5216af..caf4ba4ec 100644 --- a/java/google/registry/storage/drive/BUILD +++ b/java/google/registry/storage/drive/BUILD @@ -8,17 +8,12 @@ java_library( name = "drive", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/drive", - "//java/com/google/api/client/http", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/util/concurrent", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", + "@com_google_apis_google_api_services_drive", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_http_client", + "@javax_inject", + "@joda_time", ], ) diff --git a/java/google/registry/tldconfig/idn/BUILD b/java/google/registry/tldconfig/idn/BUILD index a47c9aa2a..146979bbf 100644 --- a/java/google/registry/tldconfig/idn/BUILD +++ b/java/google/registry/tldconfig/idn/BUILD @@ -9,15 +9,12 @@ java_library( srcs = glob(["*.java"]), resources = glob(["*.txt"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", "//java/google/registry/util", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_re2j", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/tmch/BUILD b/java/google/registry/tmch/BUILD index 70682ef13..82fb9265b 100644 --- a/java/google/registry/tmch/BUILD +++ b/java/google/registry/tmch/BUILD @@ -13,27 +13,22 @@ java_library( "*.asc", ]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", "//java/google/registry/keyring/api", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/appengine:appengine-api", - "//third_party/java/bouncycastle", - "//third_party/java/bouncycastle_bcpg", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_re2j", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@org_bouncycastle_bcpg_jdk15on", + "@org_bouncycastle_bcpkix_jdk15on", ], ) diff --git a/java/google/registry/tools/BUILD b/java/google/registry/tools/BUILD index b27b4f7f1..bd4c6c557 100644 --- a/java/google/registry/tools/BUILD +++ b/java/google/registry/tools/BUILD @@ -29,20 +29,6 @@ java_library( ]), visibility = [":allowed-tools"], deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//java/com/google/api/client/googleapis/auth/oauth2", - "//java/com/google/api/client/http", - "//java/com/google/api/client/http/javanet", - "//java/com/google/api/client/json", - "//java/com/google/api/client/json/jackson2", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/hash", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/primitives", - "//java/com/google/common/util/concurrent", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/dns", @@ -67,22 +53,27 @@ 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/java/bouncycastle", - "//third_party/java/bouncycastle_bcpg", - "//third_party/java/dagger", - "//third_party/java/jcommander", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/json", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", + "@com_beust_jcommander", + "@com_google_api_client", + "@com_google_apis_google_api_services_bigquery", + "@com_google_appengine_api_1_0_sdk", + "@com_google_appengine_remote_api", + "@com_google_appengine_remote_api//:link", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_http_client", + "@com_google_http_client_jackson2", + "@com_google_re2j", + "@com_googlecode_json_simple", "@io_bazel_rules_closure//closure/templates", + "@javax_inject", + "@joda_time", + "@org_bouncycastle_bcpg_jdk15on", + "@org_bouncycastle_bcpkix_jdk15on", + "@org_joda_money", + "@org_json", ], ) @@ -92,7 +83,7 @@ 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/params/BUILD b/java/google/registry/tools/params/BUILD index 5574f22d9..95eff6b50 100644 --- a/java/google/registry/tools/params/BUILD +++ b/java/google/registry/tools/params/BUILD @@ -9,17 +9,13 @@ java_library( srcs = glob(["*.java"]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//java/com/google/common/primitives", "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/jcommander", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/re2j", + "@com_beust_jcommander", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_re2j", + "@joda_time", + "@org_joda_money", ], ) diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD index 859cf381d..8560cf759 100644 --- a/java/google/registry/tools/server/BUILD +++ b/java/google/registry/tools/server/BUILD @@ -8,13 +8,6 @@ java_library( name = "server", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/primitives", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", "//java/google/registry/export", "//java/google/registry/flows", @@ -25,16 +18,17 @@ java_library( "//java/google/registry/model", "//java/google/registry/request", "//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/dagger", - "//third_party/java/jcommander", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@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_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@org_joda_money", ], ) diff --git a/java/google/registry/tools/server/javascrap/BUILD b/java/google/registry/tools/server/javascrap/BUILD index eae47cc8c..65dda8420 100644 --- a/java/google/registry/tools/server/javascrap/BUILD +++ b/java/google/registry/tools/server/javascrap/BUILD @@ -8,21 +8,19 @@ java_library( name = "javascrap", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/dns", "//java/google/registry/mapreduce", "//java/google/registry/mapreduce/inputs", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/appengine_mapreduce2:appengine_mapreduce", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", + "@com_google_appengine_api_1_0_sdk", + "@com_google_appengine_tools_appengine_mapreduce", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@joda_time", ], ) diff --git a/java/google/registry/ui/BUILD b/java/google/registry/ui/BUILD index fb39ff112..00b0a38e0 100644 --- a/java/google/registry/ui/BUILD +++ b/java/google/registry/ui/BUILD @@ -61,11 +61,11 @@ java_library( srcs = glob(["*.java"]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/common/base", "//java/google/registry/config", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", - "//third_party/java/jsr305_annotations", + "@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/forms/BUILD b/java/google/registry/ui/forms/BUILD index 65ccdcc00..69e70affd 100644 --- a/java/google/registry/ui/forms/BUILD +++ b/java/google/registry/ui/forms/BUILD @@ -8,10 +8,8 @@ java_library( name = "forms", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//third_party/java/jsr305_annotations", - "//third_party/java/re2j", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_re2j", ], ) diff --git a/java/google/registry/ui/server/BUILD b/java/google/registry/ui/server/BUILD index acf2ae239..5948b756f 100644 --- a/java/google/registry/ui/server/BUILD +++ b/java/google/registry/ui/server/BUILD @@ -13,20 +13,17 @@ java_library( "//java/google/registry/ui/css:registrar_dbg.css.js", ], deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/model", "//java/google/registry/ui", "//java/google/registry/ui/forms", "//java/google/registry/util", - "//third_party/java/appengine:appengine-api", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_re2j", + "@com_googlecode_json_simple", "@io_bazel_rules_closure//closure/templates", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD index 9dc31903b..027ea07e4 100644 --- a/java/google/registry/ui/server/registrar/BUILD +++ b/java/google/registry/ui/server/registrar/BUILD @@ -12,11 +12,6 @@ java_library( "//java/google/registry/ui/css:registrar_dbg.css.js", ], deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/braintree", "//java/google/registry/config", "//java/google/registry/export/sheet", @@ -29,15 +24,16 @@ 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/java/braintree", - "//third_party/java/dagger", - "//third_party/java/joda_money", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", + "@com_braintreepayments_gateway_braintree_java", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_re2j", "@io_bazel_rules_closure//closure/templates", + "@javax_inject", + "@javax_servlet_api", + "@org_joda_money", ], ) diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD index c58496e5e..f161b7e36 100644 --- a/java/google/registry/util/BUILD +++ b/java/google/registry/util/BUILD @@ -8,26 +8,16 @@ java_library( name = "util", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/cache", - "//java/com/google/common/collect", - "//java/com/google/common/escape", - "//java/com/google/common/io", - "//java/com/google/common/math", - "//java/com/google/common/net", - "//java/com/google/common/primitives", - "//java/com/google/common/reflect", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", - "//third_party/java/icu4j", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_re2j", + "@com_ibm_icu_icu4j", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/whois/BUILD b/java/google/registry/whois/BUILD index 547b6b759..612ff9037 100644 --- a/java/google/registry/whois/BUILD +++ b/java/google/registry/whois/BUILD @@ -8,23 +8,18 @@ java_library( name = "whois", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/html", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", ], ) diff --git a/java/google/registry/xjc/BUILD b/java/google/registry/xjc/BUILD index 0ad12e680..6f1b89cb6 100644 --- a/java/google/registry/xjc/BUILD +++ b/java/google/registry/xjc/BUILD @@ -11,10 +11,10 @@ java_library( srcs = glob(["*.java"]) + xjc_generated_files + pkginfo_generated_files, visibility = ["//visibility:public"], deps = [ - "//java/com/google/common/collect", "//java/google/registry/xml", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@joda_time", ], ) @@ -24,7 +24,7 @@ sh_binary( data = [ "bindings.xjb", "//java/google/registry/xml:xml_schema_files", - "//third_party/java/jaxb:jaxb-xjc", + "@com_sun_xml_bind_jaxb_xjc//:XJCFacade", ], ) @@ -37,7 +37,7 @@ genrule( outs = xjc_generated_files, cmd = " && ".join([ "REP=$$(pwd)", - "XJC=$$REP/$(location //third_party/java/jaxb:jaxb-xjc)", + "XJC=$$REP/$(location @com_sun_xml_bind_jaxb_xjc//:XJCFacade)", "OUT=$$REP/$(GENDIR)/java", "TMP=$$(mktemp -d $${TMPDIR:-/tmp}/jaxb.XXXXXXXXXX)", "mkdir -p $$OUT", @@ -51,7 +51,7 @@ genrule( "cd $$REP", "rm -rf $$TMP", ]), - tools = ["//third_party/java/jaxb:jaxb-xjc"], + tools = ["@com_sun_xml_bind_jaxb_xjc//:XJCFacade"], ) sh_binary( diff --git a/java/google/registry/xml/BUILD b/java/google/registry/xml/BUILD index cb678a301..078a0fa40 100644 --- a/java/google/registry/xml/BUILD +++ b/java/google/registry/xml/BUILD @@ -14,11 +14,9 @@ java_library( srcs = glob(["*.java"]), resources = [":xml_schema_files"], deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/re2j", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_re2j", + "@joda_time", ], ) diff --git a/javatests/google/registry/backup/BUILD b/javatests/google/registry/backup/BUILD index 53d7700e7..06140331a 100644 --- a/javatests/google/registry/backup/BUILD +++ b/javatests/google/registry/backup/BUILD @@ -12,25 +12,21 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//java/com/google/common/primitives", - "//java/com/google/common/util/concurrent", "//java/google/registry/backup", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/appengine_gcs_client", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_appengine_tools_appengine_gcs_client", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/batch/BUILD b/javatests/google/registry/batch/BUILD index cf6962b18..527da5418 100644 --- a/javatests/google/registry/batch/BUILD +++ b/javatests/google/registry/batch/BUILD @@ -11,13 +11,6 @@ java_library( name = "batch", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//java/com/google/api/client/util", - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/batch", "//java/google/registry/bigquery", "//java/google/registry/flows", @@ -26,19 +19,22 @@ 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/dagger", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@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_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_http_client", + "@com_google_re2j", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_joda_money", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/bigquery/BUILD b/javatests/google/registry/bigquery/BUILD index ad0412582..4cb320a88 100644 --- a/javatests/google/registry/bigquery/BUILD +++ b/javatests/google/registry/bigquery/BUILD @@ -12,18 +12,17 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*"]), deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/common/collect", "//java/google/registry/bigquery", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/truth", + "@com_google_apis_google_api_services_bigquery", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_http_client", + "@com_google_truth", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/config/BUILD b/javatests/google/registry/config/BUILD index 13071226b..bebe71949 100644 --- a/javatests/google/registry/config/BUILD +++ b/javatests/google/registry/config/BUILD @@ -11,10 +11,10 @@ java_library( name = "config", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/annotations", "//java/google/registry/config", - "//third_party/java/junit", - "//third_party/java/truth", + "@com_google_guava", + "@com_google_truth", + "@junit", ], ) diff --git a/javatests/google/registry/cron/BUILD b/javatests/google/registry/cron/BUILD index 7329cf8a6..15989e30b 100644 --- a/javatests/google/registry/cron/BUILD +++ b/javatests/google/registry/cron/BUILD @@ -11,19 +11,18 @@ java_library( name = "cron", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/cron", "//java/google/registry/model", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/joda_time", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_guava", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/dns/BUILD b/javatests/google/registry/dns/BUILD index 979f035e1..f25401b78 100644 --- a/javatests/google/registry/dns/BUILD +++ b/javatests/google/registry/dns/BUILD @@ -12,11 +12,6 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*.txt"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/cron", "//java/google/registry/dns", @@ -27,16 +22,17 @@ java_library( "//java/google/registry/request", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_truth", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/dns/writer/clouddns/BUILD b/javatests/google/registry/dns/writer/clouddns/BUILD index 24b394506..448436c8c 100644 --- a/javatests/google/registry/dns/writer/clouddns/BUILD +++ b/javatests/google/registry/dns/writer/clouddns/BUILD @@ -11,24 +11,20 @@ java_library( name = "clouddns", srcs = glob(["*Test.java"]), deps = [ - "//apiserving/discoverydata/cloud/dns:cloud_dns_v2beta1_versioned", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/util/concurrent", "//java/google/registry/dns/writer/clouddns", "//java/google/registry/model", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_apis_google_api_services_dns", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_truth", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/dns/writer/dnsupdate/BUILD b/javatests/google/registry/dns/writer/dnsupdate/BUILD index e0b93fec9..ab87bf0a0 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/BUILD +++ b/javatests/google/registry/dns/writer/dnsupdate/BUILD @@ -11,23 +11,20 @@ java_library( name = "dnsupdate", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/dns/writer/dnsupdate", "//java/google/registry/model", "//javatests/google/registry/testing", - "//third_party/java/dagger", - "//third_party/java/dnsjava", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_re2j", + "@com_google_truth", + "@dnsjava", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/export/BUILD b/javatests/google/registry/export/BUILD index 44fdd168c..7495273a6 100644 --- a/javatests/google/registry/export/BUILD +++ b/javatests/google/registry/export/BUILD @@ -15,14 +15,6 @@ java_library( "reporting_kinds.txt", ]), deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//apiserving/discoverydata/drive", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/export", @@ -35,18 +27,22 @@ 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/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@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_guava", + "@com_google_http_client", + "@com_google_re2j", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/export/sheet/BUILD b/javatests/google/registry/export/sheet/BUILD index 386cd7c1c..c060cdfac 100644 --- a/javatests/google/registry/export/sheet/BUILD +++ b/javatests/google/registry/export/sheet/BUILD @@ -9,22 +9,20 @@ java_library( name = "sheet", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//java/com/google/gdata:spreadsheet", "//java/google/registry/config", "//java/google/registry/export/sheet", "//java/google/registry/model", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_code_findbugs_jsr305", + "@com_google_gdata_core", + "@com_google_guava", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/flows/BUILD b/javatests/google/registry/flows/BUILD index cb6783091..26a7e9a1f 100644 --- a/javatests/google/registry/flows/BUILD +++ b/javatests/google/registry/flows/BUILD @@ -24,12 +24,6 @@ java_library( ]), resources = glob(["**/testdata/*.xml"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/testing", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/flows", @@ -43,19 +37,21 @@ 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/java/dagger", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_appengine_testing", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_guava_testlib", + "@com_google_re2j", + "@com_google_truth", + "@com_googlecode_json_simple", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_joda_money", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/groups/BUILD b/javatests/google/registry/groups/BUILD index de407cb0f..6c010eadf 100644 --- a/javatests/google/registry/groups/BUILD +++ b/javatests/google/registry/groups/BUILD @@ -11,27 +11,24 @@ java_library( name = "groups", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/admin:admin_directory_v1", - "//apiserving/discoverydata/groupssettings", - "//java/com/google/api/client/googleapis/json", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/api/client/json/jackson2", - "//java/com/google/api/client/testing/http", - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/cron", "//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", - "//third_party/java/joda_time", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@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", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/mapreduce/inputs/BUILD b/javatests/google/registry/mapreduce/inputs/BUILD index ff3131992..993187584 100644 --- a/javatests/google/registry/mapreduce/inputs/BUILD +++ b/javatests/google/registry/mapreduce/inputs/BUILD @@ -11,21 +11,20 @@ java_library( name = "inputs", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/config", "//java/google/registry/mapreduce/inputs", "//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/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/junit", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_appengine_testing", + "@com_google_appengine_tools_appengine_mapreduce", + "@com_google_guava", + "@com_google_truth", + "@joda_time", + "@junit", + "@org_joda_money", ], ) diff --git a/javatests/google/registry/model/BUILD b/javatests/google/registry/model/BUILD index b03964286..15538408c 100644 --- a/javatests/google/registry/model/BUILD +++ b/javatests/google/registry/model/BUILD @@ -19,13 +19,6 @@ java_library( "schema.txt", ] + glob(["**/testdata/*.xml"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/testing", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", "//java/google/registry/flows", "//java/google/registry/model", @@ -33,14 +26,16 @@ 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/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_appengine_testing", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_guava_testlib", + "@com_google_truth", + "@joda_time", + "@junit", + "@org_joda_money", ], ) diff --git a/javatests/google/registry/module/backend/BUILD b/javatests/google/registry/module/backend/BUILD index 1037aef22..5b687ea8d 100644 --- a/javatests/google/registry/module/backend/BUILD +++ b/javatests/google/registry/module/backend/BUILD @@ -11,15 +11,15 @@ 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", "//javatests/google/registry/testing", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_truth", + "@javax_servlet_api", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD index 85998f0ca..4a041feba 100644 --- a/javatests/google/registry/module/frontend/BUILD +++ b/javatests/google/registry/module/frontend/BUILD @@ -11,15 +11,15 @@ 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", "//javatests/google/registry/testing", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_truth", + "@javax_servlet_api", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/module/tools/BUILD b/javatests/google/registry/module/tools/BUILD index dfe2e6495..1b6ef6686 100644 --- a/javatests/google/registry/module/tools/BUILD +++ b/javatests/google/registry/module/tools/BUILD @@ -11,14 +11,14 @@ 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", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_truth", + "@javax_servlet_api", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/monitoring/metrics/BUILD b/javatests/google/registry/monitoring/metrics/BUILD index c55f471d5..b3f8cefff 100644 --- a/javatests/google/registry/monitoring/metrics/BUILD +++ b/javatests/google/registry/monitoring/metrics/BUILD @@ -11,18 +11,16 @@ java_library( name = "metrics", srcs = glob(["*.java"]), deps = [ - "//google/monitoring:monitoring_java_lib", - "//java/com/google/api/client/googleapis/json", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json/jackson2", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/util/concurrent", "//java/google/registry/monitoring/metrics", - "//third_party/java/joda_time", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/truth", + "@com_google_api_client", + "@com_google_apis_google_api_services_monitoring", + "@com_google_guava", + "@com_google_http_client", + "@com_google_http_client_jackson2", + "@com_google_truth", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD index b48db8528..b9f6fc5a9 100644 --- a/javatests/google/registry/monitoring/whitebox/BUILD +++ b/javatests/google/registry/monitoring/whitebox/BUILD @@ -11,14 +11,6 @@ java_library( name = "whitebox", srcs = glob(["*.java"]), deps = [ - "//apiserving/discoverydata/bigquery:bigqueryv2", - "//java/com/google/api/client/http", - "//java/com/google/api/client/json", - "//java/com/google/api/client/util", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//java/com/google/common/testing", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/mapreduce", @@ -27,17 +19,21 @@ 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/java/auto:auto_value", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@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", + "@com_google_http_client", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_joda_money", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/pricing/BUILD b/javatests/google/registry/pricing/BUILD index 215f2498f..e172b5fca 100644 --- a/javatests/google/registry/pricing/BUILD +++ b/javatests/google/registry/pricing/BUILD @@ -11,19 +11,16 @@ java_library( name = "pricing", srcs = glob(["*Test.java"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/model", "//java/google/registry/pricing", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/truth", + "@com_google_guava", + "@com_google_truth", + "@joda_time", + "@junit", + "@org_joda_money", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD index edf2991a2..1b2ff3680 100644 --- a/javatests/google/registry/rdap/BUILD +++ b/javatests/google/registry/rdap/BUILD @@ -12,25 +12,22 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*.json"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/rdap", "//java/google/registry/request", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_code_findbugs_jsr305", + "@com_google_dagger", + "@com_google_guava", + "@com_google_truth", + "@com_googlecode_json_simple", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/rde/BUILD b/javatests/google/registry/rde/BUILD index ef3a1b2f7..92b50873c 100644 --- a/javatests/google/registry/rde/BUILD +++ b/javatests/google/registry/rde/BUILD @@ -12,10 +12,6 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/gcs", "//java/google/registry/keyring/api", @@ -31,23 +27,24 @@ 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/java/bouncycastle", - "//third_party/java/bouncycastle_bcpg", - "//third_party/java/dagger", - "//third_party/java/ftpserver", - "//third_party/java/hamcrest", - "//third_party/java/joda_money", - "//third_party/java/joda_time", "//third_party/java/jsch", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@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", + "@com_google_truth", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_apache_ftpserver_core", + "@org_bouncycastle_bcpg_jdk15on", + "@org_bouncycastle_bcpkix_jdk15on", + "@org_hamcrest_library", + "@org_joda_money", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/rde/imports/BUILD b/javatests/google/registry/rde/imports/BUILD index 52debc87f..9c9ffc263 100644 --- a/javatests/google/registry/rde/imports/BUILD +++ b/javatests/google/registry/rde/imports/BUILD @@ -12,10 +12,6 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/gcs", "//java/google/registry/mapreduce", @@ -27,16 +23,17 @@ java_library( "//javatests/google/registry/testing", "//javatests/google/registry/testing/mapreduce", "//javatests/google/registry/xml", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/appengine_gcs_client", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/truth", + "@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", + "@com_google_truth", + "@javax_inject", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/request/BUILD b/javatests/google/registry/request/BUILD index 6a839aedb..5a6888399 100644 --- a/javatests/google/registry/request/BUILD +++ b/javatests/google/registry/request/BUILD @@ -11,22 +11,20 @@ java_library( name = "request", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//java/com/google/common/testing", "//java/google/registry/request", "//java/google/registry/security", "//javatests/google/registry/security", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr330_inject", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_guava", + "@com_google_guava_testlib", + "@com_google_truth", + "@com_googlecode_json_simple", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/security/BUILD b/javatests/google/registry/security/BUILD index db7fc2011..b260b8aa4 100644 --- a/javatests/google/registry/security/BUILD +++ b/javatests/google/registry/security/BUILD @@ -14,20 +14,18 @@ java_library( exclude = glob(["*ServletTest.java"]), ), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//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", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_appengine_testing", + "@com_google_guava", + "@com_google_truth", + "@com_googlecode_json_simple", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/server/BUILD b/javatests/google/registry/server/BUILD index 3409dcc9c..63942dd88 100644 --- a/javatests/google/registry/server/BUILD +++ b/javatests/google/registry/server/BUILD @@ -17,16 +17,12 @@ java_library( ], visibility = ["//visibility:public"], deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", - "//java/com/google/common/primitives", - "//java/com/google/common/util/concurrent", "//java/google/registry/util", - "//third_party/java/auto:auto_value", - "//third_party/java/jetty/v6_1_22", - "//third_party/java/jsr305_annotations", - "//third_party/java/servlet/servlet_api", + "@com_google_auto_value", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@javax_servlet_api", + "@org_mortbay_jetty", ], ) @@ -34,12 +30,12 @@ java_library( name = "Fixture", srcs = ["Fixture.java"], deps = [ - "//java/com/google/common/collect", "//java/google/registry/model", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api", - "//third_party/java/joda_time", "//third_party/java/objectify:objectify-v4_1", + "@com_google_appengine_api_1_0_sdk", + "@com_google_guava", + "@joda_time", ], ) @@ -52,14 +48,13 @@ java_library( ], deps = [ ":TestServer", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//java/google/registry/model", "//java/google/registry/module/backend", "//java/google/registry/module/frontend", - "//third_party/java/jsr305_annotations", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@javax_servlet_api", ], ) @@ -70,12 +65,11 @@ java_binary( deps = [ ":Fixture", ":RegistryTestServer", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//java/google/registry/tools/params", "//java/google/registry/ui", "//javatests/google/registry/testing", - "//third_party/java/jcommander", - "//third_party/java/junit", + "@com_beust_jcommander", + "@com_google_guava", + "@junit", ], ) diff --git a/javatests/google/registry/storage/drive/BUILD b/javatests/google/registry/storage/drive/BUILD index eb070f7aa..c8cd47d17 100644 --- a/javatests/google/registry/storage/drive/BUILD +++ b/javatests/google/registry/storage/drive/BUILD @@ -11,16 +11,14 @@ java_library( name = "drive", srcs = glob(["*Test.java"]), deps = [ - "//apiserving/discoverydata/drive", - "//java/com/google/api/client/http", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/storage/drive", "//javatests/google/registry/testing", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/truth", + "@com_google_apis_google_api_services_drive", + "@com_google_guava", + "@com_google_http_client", + "@com_google_truth", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD index 0126d28dc..48ead12be 100644 --- a/javatests/google/registry/testing/BUILD +++ b/javatests/google/registry/testing/BUILD @@ -20,14 +20,6 @@ java_library( "//java/google/registry:env/common/default/WEB-INF/queue.xml", ] + glob(["*.csv"]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/cache", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/testing", - "//java/com/google/common/util/concurrent", "//java/google/registry/config", "//java/google/registry/dns:constants", "//java/google/registry/dns/writer", @@ -38,24 +30,26 @@ 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/java/auto:auto_value", - "//third_party/java/bouncycastle", - "//third_party/java/bouncycastle_bcpg", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/json", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@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_guava", + "@com_google_guava_testlib", + "@com_google_truth", + "@com_googlecode_json_simple", + "@javax_inject", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_bouncycastle_bcpg_jdk15on", + "@org_bouncycastle_bcpkix_jdk15on", + "@org_joda_money", + "@org_json", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD index e8beee214..228eaea6a 100644 --- a/javatests/google/registry/testing/mapreduce/BUILD +++ b/javatests/google/registry/testing/mapreduce/BUILD @@ -11,24 +11,23 @@ java_library( name = "mapreduce", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/config", "//java/google/registry/mapreduce", "//java/google/registry/model", "//java/google/registry/util", "//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", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@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_guava", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/testing/sftp/BUILD b/javatests/google/registry/testing/sftp/BUILD index f54950d29..f79490ee8 100644 --- a/javatests/google/registry/testing/sftp/BUILD +++ b/javatests/google/registry/testing/sftp/BUILD @@ -9,14 +9,13 @@ java_library( name = "sftp", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/util", - "//third_party/java/apache_sshd", - "//third_party/java/bouncycastle", - "//third_party/java/bouncycastle_bcpg", - "//third_party/java/ftpserver", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@junit", + "@org_apache_ftpserver_core", + "@org_apache_sshd_core", + "@org_bouncycastle_bcpg_jdk15on", + "@org_bouncycastle_bcpkix_jdk15on", ], ) diff --git a/javatests/google/registry/tldconfig/idn/BUILD b/javatests/google/registry/tldconfig/idn/BUILD index ad213c149..4cbb5761a 100644 --- a/javatests/google/registry/tldconfig/idn/BUILD +++ b/javatests/google/registry/tldconfig/idn/BUILD @@ -13,12 +13,11 @@ java_library( "*.java", ]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/tldconfig/idn", "//javatests/google/registry/testing", - "//third_party/java/junit", - "//third_party/java/truth", + "@com_google_guava", + "@com_google_truth", + "@junit", ], ) diff --git a/javatests/google/registry/tmch/BUILD b/javatests/google/registry/tmch/BUILD index de79189ab..712294655 100644 --- a/javatests/google/registry/tmch/BUILD +++ b/javatests/google/registry/tmch/BUILD @@ -17,25 +17,22 @@ java_library( "testdata/*/*/*", ]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/tmch", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/bouncycastle", - "//third_party/java/bouncycastle_bcpg", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_bouncycastle_bcpg_jdk15on", + "@org_bouncycastle_bcpkix_jdk15on", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/tools/BUILD b/javatests/google/registry/tools/BUILD index d4b886bcb..fd218806e 100644 --- a/javatests/google/registry/tools/BUILD +++ b/javatests/google/registry/tools/BUILD @@ -16,12 +16,6 @@ java_library( "testdata/*.*", ]), deps = [ - "//java/com/google/common/annotations", - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/reflect", "//java/google/registry/config", "//java/google/registry/flows", "//java/google/registry/keyring/api", @@ -39,19 +33,20 @@ java_library( "//javatests/google/registry/rde", "//javatests/google/registry/testing", "//javatests/google/registry/xml", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/appengine:appengine-remote-api-link", - "//third_party/java/jcommander", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/truth", + "@com_beust_jcommander", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_appengine_remote_api//:link", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_re2j", + "@com_google_truth", + "@com_googlecode_json_simple", + "@javax_inject", + "@joda_time", + "@junit", + "@org_joda_money", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/tools/params/BUILD b/javatests/google/registry/tools/params/BUILD index 754b6a04f..06eb16892 100644 --- a/javatests/google/registry/tools/params/BUILD +++ b/javatests/google/registry/tools/params/BUILD @@ -9,17 +9,16 @@ java_library( name = "params", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/model", "//java/google/registry/tools/params", "//javatests/google/registry/testing", - "//third_party/java/hamcrest", - "//third_party/java/jcommander", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/junit", - "//third_party/java/truth", + "@com_beust_jcommander", + "@com_google_guava", + "@com_google_truth", + "@joda_time", + "@junit", + "@org_hamcrest_library", + "@org_joda_money", ], ) diff --git a/javatests/google/registry/tools/server/BUILD b/javatests/google/registry/tools/server/BUILD index ff06657ca..d5c6f6395 100644 --- a/javatests/google/registry/tools/server/BUILD +++ b/javatests/google/registry/tools/server/BUILD @@ -12,8 +12,6 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", "//java/google/registry/groups", "//java/google/registry/mapreduce", "//java/google/registry/model", @@ -23,17 +21,18 @@ 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/joda_money", - "//third_party/java/joda_time", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/re2j", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_appengine_tools_appengine_gcs_client", + "@com_google_appengine_tools_appengine_mapreduce", + "@com_google_guava", + "@com_google_re2j", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_joda_money", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/ui/forms/BUILD b/javatests/google/registry/ui/forms/BUILD index 94be4796d..c27b3b501 100644 --- a/javatests/google/registry/ui/forms/BUILD +++ b/javatests/google/registry/ui/forms/BUILD @@ -11,16 +11,15 @@ java_library( name = "forms", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/testing", "//java/google/registry/ui/forms", "//javatests/google/registry/testing", - "//third_party/java/hamcrest", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/re2j", - "//third_party/java/truth", + "@com_google_guava", + "@com_google_guava_testlib", + "@com_google_re2j", + "@com_google_truth", + "@junit", + "@org_hamcrest_library", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/ui/server/BUILD b/javatests/google/registry/ui/server/BUILD index 1a6a1cbff..c12a8184b 100644 --- a/javatests/google/registry/ui/server/BUILD +++ b/javatests/google/registry/ui/server/BUILD @@ -14,9 +14,9 @@ java_library( "//java/google/registry/ui/forms", "//java/google/registry/ui/server", "//javatests/google/registry/testing", - "//third_party/java/hamcrest", - "//third_party/java/junit", - "//third_party/java/truth", + "@com_google_truth", + "@junit", + "@org_hamcrest_library", ], ) diff --git a/javatests/google/registry/ui/server/registrar/BUILD b/javatests/google/registry/ui/server/registrar/BUILD index 56b95f071..48455d62c 100644 --- a/javatests/google/registry/ui/server/registrar/BUILD +++ b/javatests/google/registry/ui/server/registrar/BUILD @@ -12,11 +12,6 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/testing", "//java/google/registry/braintree", "//java/google/registry/config", "//java/google/registry/export/sheet", @@ -28,16 +23,18 @@ java_library( "//java/google/registry/util", "//javatests/google/registry/security", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api-testonly", - "//third_party/java/braintree", - "//third_party/java/joda_money", - "//third_party/java/joda_time", - "//third_party/java/json_simple", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_braintreepayments_gateway_braintree_java", + "@com_google_appengine_api_1_0_sdk//:testonly", + "@com_google_guava", + "@com_google_guava_testlib", + "@com_google_truth", + "@com_googlecode_json_simple", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_joda_money", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/util/BUILD b/javatests/google/registry/util/BUILD index 70df90ca9..0725042bf 100644 --- a/javatests/google/registry/util/BUILD +++ b/javatests/google/registry/util/BUILD @@ -11,21 +11,17 @@ java_library( name = "util", srcs = glob(["*.java"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", - "//java/com/google/common/testing", - "//java/com/google/common/util/concurrent", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-api", - "//third_party/java/joda_time", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/mockito", - "//third_party/java/re2j", - "//third_party/java/truth", + "@com_google_appengine_api_1_0_sdk", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_guava_testlib", + "@com_google_re2j", + "@com_google_truth", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/whois/BUILD b/javatests/google/registry/whois/BUILD index e43cb4b53..d2d09cfac 100644 --- a/javatests/google/registry/whois/BUILD +++ b/javatests/google/registry/whois/BUILD @@ -12,24 +12,21 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*.txt"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/io", - "//java/com/google/common/net", "//java/google/registry/config", "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", "//java/google/registry/whois", "//javatests/google/registry/testing", - "//third_party/java/appengine:appengine-testing", - "//third_party/java/dagger", - "//third_party/java/joda_time", - "//third_party/java/junit", - "//third_party/java/mockito", "//third_party/java/objectify:objectify-v4_1", - "//third_party/java/servlet/servlet_api", - "//third_party/java/truth", + "@com_google_appengine_testing", + "@com_google_dagger", + "@com_google_guava", + "@com_google_truth", + "@javax_servlet_api", + "@joda_time", + "@junit", + "@org_mockito_all", ], ) diff --git a/javatests/google/registry/xjc/BUILD b/javatests/google/registry/xjc/BUILD index b7c972a71..cdde74f7b 100644 --- a/javatests/google/registry/xjc/BUILD +++ b/javatests/google/registry/xjc/BUILD @@ -15,11 +15,11 @@ java_library( "//java/google/registry/util", "//java/google/registry/xjc", "//javatests/google/registry/testing", - "//third_party/java/hamcrest", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/re2j", - "//third_party/java/truth", + "@com_google_code_findbugs_jsr305", + "@com_google_re2j", + "@com_google_truth", + "@junit", + "@org_hamcrest_library", ], ) diff --git a/javatests/google/registry/xml/BUILD b/javatests/google/registry/xml/BUILD index 3398433ad..79308b9c9 100644 --- a/javatests/google/registry/xml/BUILD +++ b/javatests/google/registry/xml/BUILD @@ -12,17 +12,15 @@ java_library( srcs = glob(["*.java"]), resources = glob(["testdata/*.xml"]), deps = [ - "//java/com/google/common/base", - "//java/com/google/common/collect", - "//java/com/google/common/net", "//java/google/registry/util", "//java/google/registry/xml", "//javatests/google/registry/testing", - "//third_party/java/joda_time", - "//third_party/java/json", - "//third_party/java/jsr305_annotations", - "//third_party/java/junit", - "//third_party/java/truth", + "@com_google_code_findbugs_jsr305", + "@com_google_guava", + "@com_google_truth", + "@joda_time", + "@junit", + "@org_json", ], ) diff --git a/third_party/java/appengine_mapreduce2/BUILD b/third_party/java/appengine_mapreduce2/BUILD index dfc460962..42a7125d4 100644 --- a/third_party/java/appengine_mapreduce2/BUILD +++ b/third_party/java/appengine_mapreduce2/BUILD @@ -6,11 +6,9 @@ java_library( name = "appengine_mapreduce", exports = ["@appengine_mapreduce//jar"], runtime_deps = [ - "//third_party/java/appengine_gcs_client", - "//third_party/java/appengine_pipeline", "//third_party/java/charts4j", - "//third_party/java/joda_time", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_tools_appengine_gcs_client", + "@com_google_appengine_tools_appengine_pipeline", "@fastutil//jar", "@google_api_client//jar", "@google_api_client_appengine//jar", @@ -20,6 +18,8 @@ java_library( "@guava//jar", "@jackson_core//jar", "@jackson_databind//jar", + "@javax_servlet_api", + "@joda_time", "@protobuf_java//jar", ], ) diff --git a/third_party/java/appengine_pipeline/BUILD b/third_party/java/appengine_pipeline/BUILD index c8d3080ce..f87a6d3a4 100644 --- a/third_party/java/appengine_pipeline/BUILD +++ b/third_party/java/appengine_pipeline/BUILD @@ -6,9 +6,9 @@ java_library( name = "appengine_pipeline", exports = ["@appengine_pipeline//jar"], runtime_deps = [ - "//third_party/java/appengine_gcs_client", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_tools_appengine_gcs_client", "@guava//jar", + "@javax_servlet_api", "@json//jar", ], ) diff --git a/third_party/java/auto/BUILD b/third_party/java/auto/BUILD index 7b6e3d1a9..356ac8d4b 100644 --- a/third_party/java/auto/BUILD +++ b/third_party/java/auto/BUILD @@ -54,8 +54,8 @@ java_plugin( visibility = ["//visibility:private"], deps = [ ":auto_common", - "//third_party/java/jsr305_annotations", "@auto_value//jar", + "@com_google_code_findbugs_jsr305", "@guava//jar", ], ) diff --git a/third_party/java/dagger/BUILD b/third_party/java/dagger/BUILD index f0b2a861c..efadbde7f 100644 --- a/third_party/java/dagger/BUILD +++ b/third_party/java/dagger/BUILD @@ -10,17 +10,17 @@ java_library( java_library( name = "dagger-runtime", exports = [ - "//third_party/java/jsr330_inject", "@dagger//jar", + "@javax_inject", ], ) java_library( name = "dagger-producers", exports = [ - "//third_party/java/jsr330_inject", "@dagger_producers//jar", "@guava//jar", + "@javax_inject", ], ) @@ -33,12 +33,12 @@ java_library( ":dagger-runtime", "//third_party/java/auto:auto_common", "//third_party/java/auto:auto_service", - "//third_party/java/auto:auto_value", "//third_party/java/javapoet", - "//third_party/java/jsr305_annotations", - "//third_party/java/jsr330_inject", + "@com_google_auto_value", + "@com_google_code_findbugs_jsr305", "@gson//jar", "@guava//jar", + "@javax_inject", ], ) diff --git a/third_party/java/objectify/v4_1/BUILD b/third_party/java/objectify/v4_1/BUILD index f0fed9f23..1f4421a1f 100644 --- a/third_party/java/objectify/v4_1/BUILD +++ b/third_party/java/objectify/v4_1/BUILD @@ -12,7 +12,7 @@ java_import( jars = ["objectify-4.1.3.jar"], srcjar = "objectify-4.1.3-src.jar", deps = [ - "//third_party/java/appengine:appengine-api", - "//third_party/java/servlet/servlet_api", + "@com_google_appengine_api_1_0_sdk", + "@javax_servlet_api", ], )