diff --git a/java/google/registry/BUILD b/java/google/registry/BUILD index 6e173e6f1..4618ba5be 100644 --- a/java/google/registry/BUILD +++ b/java/google/registry/BUILD @@ -16,9 +16,6 @@ package_group( ], ) - - - zip_file( name = "common_war", srcs = [ @@ -112,7 +109,6 @@ zip_file( ], ) - ################################################################################ # DOMAIN REGISTRY :: SANDBOX ENVIRONMENT # @@ -294,4 +290,3 @@ zip_file( mappings = {"java/google/registry/env/local/tools": ""}, deps = [":registry_tools_war"], ) - diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD index aa8be5faa..361babfa1 100644 --- a/java/google/registry/backup/BUILD +++ b/java/google/registry/backup/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "backup", srcs = glob(["*.java"]), @@ -15,6 +14,11 @@ java_library( "//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", @@ -24,10 +28,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", - "//java/google/registry/cron", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/batch/BUILD b/java/google/registry/batch/BUILD index e4cb5468e..fa41b9019 100644 --- a/java/google/registry/batch/BUILD +++ b/java/google/registry/batch/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "batch", srcs = glob(["*.java"]), @@ -15,6 +14,13 @@ java_library( "//java/com/google/common/html", "//java/com/google/common/io", "//java/com/google/common/net", + "//java/google/registry/config", + "//java/google/registry/mapreduce", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/pricing", + "//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", @@ -26,12 +32,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", - "//java/google/registry/mapreduce", - "//java/google/registry/mapreduce/inputs", - "//java/google/registry/model", - "//java/google/registry/pricing", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/bigquery/BUILD b/java/google/registry/bigquery/BUILD index b7d6ed0c8..019b27929 100644 --- a/java/google/registry/bigquery/BUILD +++ b/java/google/registry/bigquery/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "bigquery", srcs = glob(["*.java"]), @@ -22,12 +21,12 @@ java_library( "//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", - "//java/google/registry/config", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/braintree/BUILD b/java/google/registry/braintree/BUILD index 129bdf567..4b262e6b9 100644 --- a/java/google/registry/braintree/BUILD +++ b/java/google/registry/braintree/BUILD @@ -4,18 +4,17 @@ package( licenses(["notice"]) # Apache 2.0 - 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", - "//java/google/registry/config", - "//java/google/registry/keyring/api", - "//java/google/registry/model", ], ) diff --git a/java/google/registry/builddefs/BUILD b/java/google/registry/builddefs/BUILD index 17ccbda7c..324ab16ae 100644 --- a/java/google/registry/builddefs/BUILD +++ b/java/google/registry/builddefs/BUILD @@ -3,4 +3,3 @@ package( ) licenses(["notice"]) # Apache 2.0 - diff --git a/java/google/registry/config/BUILD b/java/google/registry/config/BUILD index 977adbdc8..84be2d164 100644 --- a/java/google/registry/config/BUILD +++ b/java/google/registry/config/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "config", srcs = glob(["*.java"]), diff --git a/java/google/registry/cron/BUILD b/java/google/registry/cron/BUILD index ee7b48a80..a24c80766 100644 --- a/java/google/registry/cron/BUILD +++ b/java/google/registry/cron/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "cron", srcs = glob(["*.java"]), @@ -13,6 +12,9 @@ java_library( "//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", @@ -20,8 +22,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/dns/BUILD b/java/google/registry/dns/BUILD index ca6c914a5..3260237cf 100644 --- a/java/google/registry/dns/BUILD +++ b/java/google/registry/dns/BUILD @@ -7,7 +7,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "constants", srcs = ["DnsConstants.java"], @@ -27,6 +26,12 @@ java_library( "//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", @@ -35,11 +40,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//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", ], ) diff --git a/java/google/registry/dns/writer/BUILD b/java/google/registry/dns/writer/BUILD index a47cc0694..7b6887b4d 100644 --- a/java/google/registry/dns/writer/BUILD +++ b/java/google/registry/dns/writer/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "writer", srcs = glob(["*.java"]), diff --git a/java/google/registry/dns/writer/clouddns/BUILD b/java/google/registry/dns/writer/clouddns/BUILD index 88b6e5fb4..4e74dc6f9 100644 --- a/java/google/registry/dns/writer/clouddns/BUILD +++ b/java/google/registry/dns/writer/clouddns/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "clouddns", srcs = glob(["*.java"]), @@ -18,11 +17,11 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/net", "//java/com/google/common/util/concurrent", - "//third_party/java/dagger", - "//third_party/java/joda_time", "//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", ], ) diff --git a/java/google/registry/dns/writer/dnsupdate/BUILD b/java/google/registry/dns/writer/dnsupdate/BUILD index 5161e3439..e09552d2f 100644 --- a/java/google/registry/dns/writer/dnsupdate/BUILD +++ b/java/google/registry/dns/writer/dnsupdate/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "dnsupdate", srcs = glob(["*.java"]), @@ -15,14 +14,14 @@ java_library( "//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", - "//java/google/registry/config", - "//java/google/registry/dns/writer", - "//java/google/registry/model", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/eclipse/BUILD b/java/google/registry/eclipse/BUILD index b633b9fb2..ae53d9add 100644 --- a/java/google/registry/eclipse/BUILD +++ b/java/google/registry/eclipse/BUILD @@ -8,11 +8,11 @@ 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", "@javawriter//jar", - "//third_party/java/dagger:dagger-compiler", ], ) diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD index 255aa99bf..9359adea4 100644 --- a/java/google/registry/export/BUILD +++ b/java/google/registry/export/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "export", srcs = glob(["*.java"]), @@ -23,16 +22,6 @@ java_library( "//java/com/google/common/html", "//java/com/google/common/io", "//java/com/google/common/net", - "//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", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/gcs", @@ -43,5 +32,15 @@ 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", ], ) diff --git a/java/google/registry/export/sheet/BUILD b/java/google/registry/export/sheet/BUILD index 341ae3d85..6a28ea7ad 100644 --- a/java/google/registry/export/sheet/BUILD +++ b/java/google/registry/export/sheet/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "sheet", srcs = glob(["*.java"]), @@ -16,6 +15,10 @@ java_library( "//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", @@ -23,9 +26,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/flows/BUILD b/java/google/registry/flows/BUILD index 244155280..dac6caa4f 100644 --- a/java/google/registry/flows/BUILD +++ b/java/google/registry/flows/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library") - filegroup( name = "flows_files", srcs = glob([ @@ -30,17 +29,6 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/math", "//java/com/google/common/net", - "//third_party/java/appengine:appengine-api", - "//third_party/java/appengine_mapreduce2:appengine_mapreduce", - "//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", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/mapreduce", @@ -54,7 +42,17 @@ java_library( "//java/google/registry/tmch", "//java/google/registry/util", "//java/google/registry/xml", - + "//third_party/java/appengine:appengine-api", + "//third_party/java/appengine_mapreduce2:appengine_mapreduce", + "//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", "@io_bazel_rules_closure//closure/templates", ], ) diff --git a/java/google/registry/gcs/BUILD b/java/google/registry/gcs/BUILD index 51e188599..5861959c6 100644 --- a/java/google/registry/gcs/BUILD +++ b/java/google/registry/gcs/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "gcs", srcs = glob(["*.java"]), @@ -12,11 +11,11 @@ java_library( "//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", - "//java/google/registry/config", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/groups/BUILD b/java/google/registry/groups/BUILD index eeaf5bbf6..1ae7aabcd 100644 --- a/java/google/registry/groups/BUILD +++ b/java/google/registry/groups/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "groups", srcs = glob(["*.java"]), @@ -16,12 +15,12 @@ java_library( "//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", - "//java/google/registry/config", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/idn/BUILD b/java/google/registry/idn/BUILD index 17ccbda7c..324ab16ae 100644 --- a/java/google/registry/idn/BUILD +++ b/java/google/registry/idn/BUILD @@ -3,4 +3,3 @@ package( ) licenses(["notice"]) # Apache 2.0 - diff --git a/java/google/registry/keyring/api/BUILD b/java/google/registry/keyring/api/BUILD index f8f20cda2..a031654e7 100644 --- a/java/google/registry/keyring/api/BUILD +++ b/java/google/registry/keyring/api/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "api", srcs = glob(["*.java"]), diff --git a/java/google/registry/loadtest/BUILD b/java/google/registry/loadtest/BUILD index 0b60762c9..78ac1668a 100644 --- a/java/google/registry/loadtest/BUILD +++ b/java/google/registry/loadtest/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "loadtest", srcs = glob(["*.java"]), @@ -13,15 +12,15 @@ java_library( "//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", - "//java/google/registry/config", - "//java/google/registry/request", - "//java/google/registry/security", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/mapreduce/BUILD b/java/google/registry/mapreduce/BUILD index d468180a4..cb55d073a 100644 --- a/java/google/registry/mapreduce/BUILD +++ b/java/google/registry/mapreduce/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "mapreduce", srcs = glob(["*.java"]), @@ -12,6 +11,10 @@ java_library( "//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", @@ -20,9 +23,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/mapreduce/inputs", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD index 8d8ea494f..0466d2f9f 100644 --- a/java/google/registry/mapreduce/inputs/BUILD +++ b/java/google/registry/mapreduce/inputs/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "inputs", srcs = glob(["*.java"]), @@ -12,6 +11,8 @@ java_library( "//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", @@ -20,7 +21,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/model", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/model/BUILD b/java/google/registry/model/BUILD index 1a0941696..bb1825e69 100644 --- a/java/google/registry/model/BUILD +++ b/java/google/registry/model/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "model", srcs = glob([ @@ -25,6 +24,9 @@ java_library( "//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", @@ -34,8 +36,5 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", - "//java/google/registry/util", - "//java/google/registry/xml", ], ) diff --git a/java/google/registry/module/backend/BUILD b/java/google/registry/module/backend/BUILD index 692f05eff..97818a900 100644 --- a/java/google/registry/module/backend/BUILD +++ b/java/google/registry/module/backend/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "backend", srcs = glob(["*.java"]), @@ -13,13 +12,6 @@ java_library( "//java/com/google/common/base", "//java/com/google/common/collect", "//java/com/google/common/net", - "//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", "//java/google/registry/backup", "//java/google/registry/batch", "//java/google/registry/bigquery", @@ -44,6 +36,13 @@ 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", ], ) diff --git a/java/google/registry/module/frontend/BUILD b/java/google/registry/module/frontend/BUILD index 8b736bb2d..d6906c409 100644 --- a/java/google/registry/module/frontend/BUILD +++ b/java/google/registry/module/frontend/BUILD @@ -4,19 +4,12 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "frontend", srcs = glob(["*.java"]), deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//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", "//java/google/registry/braintree", "//java/google/registry/config", "//java/google/registry/dns", @@ -31,6 +24,12 @@ 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", ], ) diff --git a/java/google/registry/module/tools/BUILD b/java/google/registry/module/tools/BUILD index 3b1577b7f..d85caa0e8 100644 --- a/java/google/registry/module/tools/BUILD +++ b/java/google/registry/module/tools/BUILD @@ -4,19 +4,12 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "tools", srcs = glob(["*.java"]), deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//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", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/export", @@ -32,6 +25,12 @@ 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", ], ) diff --git a/java/google/registry/monitoring/metrics/BUILD b/java/google/registry/monitoring/metrics/BUILD index a5d91aeaa..6750d0f0b 100644 --- a/java/google/registry/monitoring/metrics/BUILD +++ b/java/google/registry/monitoring/metrics/BUILD @@ -4,14 +4,13 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "metrics", srcs = glob(["*.java"]), deps = [ "//google/monitoring:monitoring_java_lib", - "//java/com/google/api/client/http", "//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", diff --git a/java/google/registry/monitoring/whitebox/BUILD b/java/google/registry/monitoring/whitebox/BUILD index c03d5374f..e8ba2352f 100644 --- a/java/google/registry/monitoring/whitebox/BUILD +++ b/java/google/registry/monitoring/whitebox/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "whitebox", srcs = glob(["*.java"]), @@ -19,6 +18,15 @@ java_library( "//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/mapreduce", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/monitoring/metrics", + "//java/google/registry/request", + "//java/google/registry/request:modules", + "//java/google/registry/util", "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", "//third_party/java/auto:auto_factory", @@ -29,14 +37,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/bigquery", - "//java/google/registry/config", - "//java/google/registry/mapreduce", - "//java/google/registry/mapreduce/inputs", - "//java/google/registry/model", - "//java/google/registry/monitoring/metrics", - "//java/google/registry/request", - "//java/google/registry/request:modules", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/pricing/BUILD b/java/google/registry/pricing/BUILD index ca667132c..26f421c1f 100644 --- a/java/google/registry/pricing/BUILD +++ b/java/google/registry/pricing/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "pricing", srcs = glob(["*.java"]), @@ -15,6 +14,8 @@ java_library( "//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", @@ -22,7 +23,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/model", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/rdap/BUILD b/java/google/registry/rdap/BUILD index 312efc2b1..c75b289e4 100644 --- a/java/google/registry/rdap/BUILD +++ b/java/google/registry/rdap/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "rdap", srcs = glob(["*.java"]), @@ -16,6 +15,10 @@ java_library( "//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", @@ -25,9 +28,5 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/rde/BUILD b/java/google/registry/rde/BUILD index 2c3125c0a..804183c1d 100644 --- a/java/google/registry/rde/BUILD +++ b/java/google/registry/rde/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "rde", srcs = glob(["*.java"]), @@ -16,6 +15,17 @@ java_library( "//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", + "//java/google/registry/mapreduce", + "//java/google/registry/mapreduce/inputs", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/tldconfig/idn", + "//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", @@ -31,16 +41,5 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", - "//java/google/registry/gcs", - "//java/google/registry/keyring/api", - "//java/google/registry/mapreduce", - "//java/google/registry/mapreduce/inputs", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/tldconfig/idn", - "//java/google/registry/util", - "//java/google/registry/xjc", - "//java/google/registry/xml", ], ) diff --git a/java/google/registry/request/BUILD b/java/google/registry/request/BUILD index 6fd7efb3b..2fbe58e28 100644 --- a/java/google/registry/request/BUILD +++ b/java/google/registry/request/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "request", srcs = glob( @@ -18,6 +17,8 @@ java_library( "//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", @@ -26,8 +27,6 @@ java_library( "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", "//third_party/java/servlet/servlet_api", - "//java/google/registry/security", - "//java/google/registry/util", ], ) @@ -43,9 +42,9 @@ java_library( "//java/com/google/api/client/json/jackson2", "//java/com/google/common/base", "//java/com/google/common/collect", - "//third_party/java/appengine:appengine-api", - "//third_party/java/dagger", "//java/google/registry/config", "//java/google/registry/keyring/api", + "//third_party/java/appengine:appengine-api", + "//third_party/java/dagger", ], ) diff --git a/java/google/registry/security/BUILD b/java/google/registry/security/BUILD index af3c1f2c0..2294542c8 100644 --- a/java/google/registry/security/BUILD +++ b/java/google/registry/security/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "security", srcs = glob( @@ -18,13 +17,13 @@ java_library( "//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", - "//java/google/registry/model", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/storage/drive/BUILD b/java/google/registry/storage/drive/BUILD index bb3bb6cce..b5f5216af 100644 --- a/java/google/registry/storage/drive/BUILD +++ b/java/google/registry/storage/drive/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "drive", srcs = glob(["*.java"]), diff --git a/java/google/registry/tldconfig/idn/BUILD b/java/google/registry/tldconfig/idn/BUILD index 17f612947..a47c9aa2a 100644 --- a/java/google/registry/tldconfig/idn/BUILD +++ b/java/google/registry/tldconfig/idn/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "idn", srcs = glob(["*.java"]), @@ -14,11 +13,11 @@ java_library( "//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", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/tmch/BUILD b/java/google/registry/tmch/BUILD index f3e59395c..70682ef13 100644 --- a/java/google/registry/tmch/BUILD +++ b/java/google/registry/tmch/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "tmch", srcs = glob(["*.java"]), @@ -20,6 +19,12 @@ java_library( "//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", @@ -30,11 +35,5 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", - "//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", ], ) diff --git a/java/google/registry/tools/BUILD b/java/google/registry/tools/BUILD index cad1a8ba5..38106b059 100644 --- a/java/google/registry/tools/BUILD +++ b/java/google/registry/tools/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - # Restrict visibility to :tools because :remoteapi-internal (and transitively # :appengine-api-link) should never be linked into an App Engine deploy jar, # since the App Engine API is provided by the runtime environment. @@ -55,8 +54,8 @@ java_library( "//java/google/registry/model", "//java/google/registry/pricing", "//java/google/registry/rde", - "//java/google/registry/security", "//java/google/registry/request:modules", + "//java/google/registry/security", "//java/google/registry/tldconfig/idn", "//java/google/registry/tmch", "//java/google/registry/tools/params", @@ -67,6 +66,7 @@ java_library( "//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", @@ -80,9 +80,6 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/re2j", - - "//third_party/java/appengine:appengine-remote-api", - "@io_bazel_rules_closure//closure/templates", ], ) @@ -97,4 +94,3 @@ java_binary( "//third_party/java/appengine:appengine-remote-api-link", ], ) - diff --git a/java/google/registry/tools/params/BUILD b/java/google/registry/tools/params/BUILD index 24ee98a7d..5574f22d9 100644 --- a/java/google/registry/tools/params/BUILD +++ b/java/google/registry/tools/params/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "params", srcs = glob(["*.java"]), @@ -15,12 +14,12 @@ java_library( "//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", - "//java/google/registry/model", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD index 460040b1b..859cf381d 100644 --- a/java/google/registry/tools/server/BUILD +++ b/java/google/registry/tools/server/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "server", srcs = glob(["*.java"]), @@ -16,6 +15,16 @@ java_library( "//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", + "//java/google/registry/gcs", + "//java/google/registry/groups", + "//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_gcs_client", "//third_party/java/appengine_mapreduce2:appengine_mapreduce", @@ -27,15 +36,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", - "//java/google/registry/export", - "//java/google/registry/flows", - "//java/google/registry/gcs", - "//java/google/registry/groups", - "//java/google/registry/mapreduce", - "//java/google/registry/mapreduce/inputs", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/util", ], ) diff --git a/java/google/registry/tools/server/javascrap/BUILD b/java/google/registry/tools/server/javascrap/BUILD index 9a25a4199..eae47cc8c 100644 --- a/java/google/registry/tools/server/javascrap/BUILD +++ b/java/google/registry/tools/server/javascrap/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "javascrap", srcs = glob(["*.java"]), @@ -12,6 +11,12 @@ java_library( "//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", @@ -19,11 +24,5 @@ java_library( "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", - "//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", ], ) diff --git a/java/google/registry/tools/soy/BUILD b/java/google/registry/tools/soy/BUILD index b1ef7a18b..46c079187 100644 --- a/java/google/registry/tools/soy/BUILD +++ b/java/google/registry/tools/soy/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library") - closure_java_template_library( name = "soy_java_wrappers", srcs = glob(["*.soy"]), diff --git a/java/google/registry/ui/BUILD b/java/google/registry/ui/BUILD index 652c9ad13..4c90a1f23 100644 --- a/java/google/registry/ui/BUILD +++ b/java/google/registry/ui/BUILD @@ -7,7 +7,6 @@ load("//java/google/registry/builddefs:zip_file.bzl", "zip_file") exports_files(["globals.txt"]) - filegroup( name = "runfiles", srcs = glob(["assets/**"]) + [ @@ -23,19 +22,19 @@ filegroup( filegroup( name = "runfiles_debug", srcs = [ - "@closure_library//:js_files", "brain_bin.js.map", "deps.js", "registrar_bin.js.map", "registrar_dbg.js", - "//javascript/closure:js_files_recursive", - "//javascript/template/soy:soy_usegoog_js_files", "//java/google/registry/ui/css:css_files", "//java/google/registry/ui/css:registrar_dbg.css", "//java/google/registry/ui/js:js_files", "//java/google/registry/ui/js/registrar:js_files", "//java/google/registry/ui/soy:js_files", "//java/google/registry/ui/soy/registrar:js_files", + "//javascript/closure:js_files_recursive", + "//javascript/template/soy:soy_usegoog_js_files", + "@closure_library//:js_files", ], ) @@ -72,14 +71,13 @@ java_library( 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", - "//java/google/registry/config", ], ) - closure_js_deps( name = "deps", deps = [ diff --git a/java/google/registry/ui/css/BUILD b/java/google/registry/ui/css/BUILD index 21f4556a8..88edd2fad 100644 --- a/java/google/registry/ui/css/BUILD +++ b/java/google/registry/ui/css/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_css_library", "closure_css_binary") - filegroup( name = "css_files", srcs = glob(["*.css"]), @@ -17,7 +16,6 @@ closure_css_library( srcs = ["kd_components.css"], ) - closure_css_library( name = "registry_lib", srcs = [ diff --git a/java/google/registry/ui/externs/BUILD b/java/google/registry/ui/externs/BUILD index d0d881834..d4c3fa0ad 100644 --- a/java/google/registry/ui/externs/BUILD +++ b/java/google/registry/ui/externs/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library") - closure_js_library( name = "externs", externs = glob(["*.js"]), diff --git a/java/google/registry/ui/forms/BUILD b/java/google/registry/ui/forms/BUILD index 57f2b5ad3..65ccdcc00 100644 --- a/java/google/registry/ui/forms/BUILD +++ b/java/google/registry/ui/forms/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "forms", srcs = glob(["*.java"]), diff --git a/java/google/registry/ui/html/BUILD b/java/google/registry/ui/html/BUILD index 5202b44ca..9ee7d2ac6 100644 --- a/java/google/registry/ui/html/BUILD +++ b/java/google/registry/ui/html/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - filegroup( name = "html_files", srcs = glob(["*.html"]), diff --git a/java/google/registry/ui/js/BUILD b/java/google/registry/ui/js/BUILD index 07985e8a6..df1b3b1b0 100644 --- a/java/google/registry/ui/js/BUILD +++ b/java/google/registry/ui/js/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library") - filegroup( name = "js_files", srcs = glob(["*.js"]), @@ -16,8 +15,8 @@ closure_js_library( name = "js", srcs = [":js_files"], deps = [ - "//javascript/closure", "//java/google/registry/ui/soy:Console", "//java/google/registry/ui/soy:Forms", + "//javascript/closure", ], ) diff --git a/java/google/registry/ui/js/registrar/BUILD b/java/google/registry/ui/js/registrar/BUILD index af41b75da..24a6c16f1 100644 --- a/java/google/registry/ui/js/registrar/BUILD +++ b/java/google/registry/ui/js/registrar/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library") - filegroup( name = "js_files", srcs = glob(["*.js"]), @@ -16,7 +15,6 @@ closure_js_library( name = "registrar", srcs = [":js_files"], deps = [ - "//javascript/closure", "//java/google/registry/ui/js", "//java/google/registry/ui/soy:Forms", "//java/google/registry/ui/soy/registrar:Console", @@ -31,5 +29,6 @@ closure_js_library( "//java/google/registry/ui/soy/registrar:Payment", "//java/google/registry/ui/soy/registrar:SecuritySettings", "//java/google/registry/ui/soy/registrar:WhoisSettings", + "//javascript/closure", ], ) diff --git a/java/google/registry/ui/server/BUILD b/java/google/registry/ui/server/BUILD index 2382b8ee9..acf2ae239 100644 --- a/java/google/registry/ui/server/BUILD +++ b/java/google/registry/ui/server/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "server", srcs = glob(["*.java"]), @@ -28,7 +27,6 @@ java_library( "//third_party/java/jsr305_annotations", "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", - "@io_bazel_rules_closure//closure/templates", ], ) diff --git a/java/google/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD index 0ff786be9..9dc31903b 100644 --- a/java/google/registry/ui/server/registrar/BUILD +++ b/java/google/registry/ui/server/registrar/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "registrar", srcs = glob(["*.java"]), @@ -18,7 +17,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//third_party/java/re2j", "//java/google/registry/braintree", "//java/google/registry/config", "//java/google/registry/export/sheet", @@ -38,8 +36,8 @@ java_library( "//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", - "@io_bazel_rules_closure//closure/templates", ], ) diff --git a/java/google/registry/ui/soy/BUILD b/java/google/registry/ui/soy/BUILD index 9a148d351..096f63ddd 100644 --- a/java/google/registry/ui/soy/BUILD +++ b/java/google/registry/ui/soy/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library", "closure_js_template_library") - filegroup( name = "js_files", srcs = [ diff --git a/java/google/registry/ui/soy/registrar/BUILD b/java/google/registry/ui/soy/registrar/BUILD index e5f51eb9e..6c6ae333a 100644 --- a/java/google/registry/ui/soy/registrar/BUILD +++ b/java/google/registry/ui/soy/registrar/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_java_template_library", "closure_js_template_library") - filegroup( name = "js_files", srcs = [ diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD index e79160007..c58496e5e 100644 --- a/java/google/registry/util/BUILD +++ b/java/google/registry/util/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "util", srcs = glob(["*.java"]), @@ -20,6 +19,7 @@ java_library( "//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", @@ -29,6 +29,5 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", ], ) diff --git a/java/google/registry/whois/BUILD b/java/google/registry/whois/BUILD index 2fb9b717a..547b6b759 100644 --- a/java/google/registry/whois/BUILD +++ b/java/google/registry/whois/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "whois", srcs = glob(["*.java"]), @@ -15,6 +14,11 @@ java_library( "//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", @@ -22,10 +26,5 @@ java_library( "//third_party/java/jsr330_inject", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", - "//java/google/registry/config", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/util", - "//java/google/registry/xml", ], ) diff --git a/java/google/registry/xjc/BUILD b/java/google/registry/xjc/BUILD index 1fb67f89d..0ad12e680 100644 --- a/java/google/registry/xjc/BUILD +++ b/java/google/registry/xjc/BUILD @@ -6,16 +6,15 @@ licenses(["notice"]) # Apache 2.0 load("//java/google/registry/xjc:generated_files.bzl", "pkginfo_generated_files", "xjc_generated_files") - java_library( name = "xjc", 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", - "//java/google/registry/xml", ], ) @@ -24,8 +23,8 @@ sh_binary( srcs = ["list_generated_files.sh"], data = [ "bindings.xjb", - "//third_party/java/jaxb:jaxb-xjc", "//java/google/registry/xml:xml_schema_files", + "//third_party/java/jaxb:jaxb-xjc", ], ) diff --git a/java/google/registry/xml/BUILD b/java/google/registry/xml/BUILD index 8d8dc0292..cb678a301 100644 --- a/java/google/registry/xml/BUILD +++ b/java/google/registry/xml/BUILD @@ -4,7 +4,6 @@ package( licenses(["notice"]) # Apache 2.0 - filegroup( name = "xml_schema_files", srcs = glob(["xsd/*.xsd"]), diff --git a/javatests/google/registry/backup/BUILD b/javatests/google/registry/backup/BUILD index 132fd960e..53d7700e7 100644 --- a/javatests/google/registry/backup/BUILD +++ b/javatests/google/registry/backup/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "backup", srcs = glob(["*.java"]), @@ -18,6 +17,11 @@ java_library( "//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", @@ -27,11 +31,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/backup", - "//java/google/registry/config", - "//java/google/registry/model", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/batch/BUILD b/javatests/google/registry/batch/BUILD index 597a9f16b..c32557d35 100644 --- a/javatests/google/registry/batch/BUILD +++ b/javatests/google/registry/batch/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "batch", srcs = glob(["*.java"]), @@ -17,6 +16,11 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", + "//java/google/registry/batch", + "//java/google/registry/model", + "//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", @@ -30,11 +34,6 @@ java_library( "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/batch", - "//java/google/registry/model", - "//java/google/registry/util", - "//javatests/google/registry/testing", - "//javatests/google/registry/testing/mapreduce", ], ) diff --git a/javatests/google/registry/bigquery/BUILD b/javatests/google/registry/bigquery/BUILD index 08058bf0a..ad0412582 100644 --- a/javatests/google/registry/bigquery/BUILD +++ b/javatests/google/registry/bigquery/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "bigquery", srcs = glob(["*.java"]), @@ -17,14 +16,14 @@ java_library( "//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", - "//java/google/registry/bigquery", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/builddefs/BUILD b/javatests/google/registry/builddefs/BUILD index 00c4c9a2c..d48ac464e 100644 --- a/javatests/google/registry/builddefs/BUILD +++ b/javatests/google/registry/builddefs/BUILD @@ -8,7 +8,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/google/registry/builddefs:zip_file.bzl", "zip_file") load("//javatests/google/registry/builddefs:zip_contents_test.bzl", "zip_contents_test") - genrule( name = "generated", outs = ["generated.txt"], diff --git a/javatests/google/registry/config/BUILD b/javatests/google/registry/config/BUILD index 805c8de9e..13071226b 100644 --- a/javatests/google/registry/config/BUILD +++ b/javatests/google/registry/config/BUILD @@ -7,15 +7,14 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - 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", - "//java/google/registry/config", ], ) diff --git a/javatests/google/registry/cron/BUILD b/javatests/google/registry/cron/BUILD index 95378fec4..7329cf8a6 100644 --- a/javatests/google/registry/cron/BUILD +++ b/javatests/google/registry/cron/BUILD @@ -7,13 +7,16 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - 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", @@ -21,10 +24,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/cron", - "//java/google/registry/model", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/dns/BUILD b/javatests/google/registry/dns/BUILD index 22ffed284..979f035e1 100644 --- a/javatests/google/registry/dns/BUILD +++ b/javatests/google/registry/dns/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "dns", srcs = glob(["*.java"]), @@ -18,16 +17,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//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", "//java/google/registry/config", "//java/google/registry/cron", "//java/google/registry/dns", @@ -38,6 +27,16 @@ 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", ], ) diff --git a/javatests/google/registry/dns/writer/clouddns/BUILD b/javatests/google/registry/dns/writer/clouddns/BUILD index 84697b27b..24b394506 100644 --- a/javatests/google/registry/dns/writer/clouddns/BUILD +++ b/javatests/google/registry/dns/writer/clouddns/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "clouddns", srcs = glob(["*Test.java"]), @@ -18,6 +17,10 @@ java_library( "//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", @@ -26,10 +29,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/dns/writer/clouddns", - "//java/google/registry/model", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/dns/writer/dnsupdate/BUILD b/javatests/google/registry/dns/writer/dnsupdate/BUILD index e85f41ef0..e0b93fec9 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/BUILD +++ b/javatests/google/registry/dns/writer/dnsupdate/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "dnsupdate", srcs = glob(["*.java"]), @@ -16,6 +15,9 @@ java_library( "//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", @@ -26,9 +28,6 @@ java_library( "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/dns/writer/dnsupdate", - "//java/google/registry/model", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/export/BUILD b/javatests/google/registry/export/BUILD index ff57b9aee..e65774f7a 100644 --- a/javatests/google/registry/export/BUILD +++ b/javatests/google/registry/export/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "export", srcs = glob(["*.java"]), @@ -23,18 +22,6 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", - "//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", "//java/google/registry/bigquery", "//java/google/registry/config", "//java/google/registry/export", @@ -47,6 +34,18 @@ 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", ], ) diff --git a/javatests/google/registry/export/sheet/BUILD b/javatests/google/registry/export/sheet/BUILD index 6c7024c43..386cd7c1c 100644 --- a/javatests/google/registry/export/sheet/BUILD +++ b/javatests/google/registry/export/sheet/BUILD @@ -5,7 +5,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "sheet", srcs = glob(["*.java"]), @@ -14,6 +13,11 @@ java_library( "//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", @@ -21,11 +25,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/config", - "//java/google/registry/export/sheet", - "//java/google/registry/model", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/flows/BUILD b/javatests/google/registry/flows/BUILD index 6f45e5b25..2202020ff 100644 --- a/javatests/google/registry/flows/BUILD +++ b/javatests/google/registry/flows/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - # Needed for the documentation tests filegroup( name = "flows_files", @@ -31,19 +30,6 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/testing", - "//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", "//java/google/registry/config", "//java/google/registry/dns", "//java/google/registry/flows", @@ -59,6 +45,19 @@ 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: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", ], ) diff --git a/javatests/google/registry/groups/BUILD b/javatests/google/registry/groups/BUILD index 480272902..de407cb0f 100644 --- a/javatests/google/registry/groups/BUILD +++ b/javatests/google/registry/groups/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "groups", srcs = glob(["*.java"]), @@ -21,6 +20,10 @@ java_library( "//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", @@ -29,10 +32,6 @@ java_library( "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/cron", - "//java/google/registry/groups", - "//java/google/registry/model", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/mapreduce/inputs/BUILD b/javatests/google/registry/mapreduce/inputs/BUILD index 395b54135..ff3131992 100644 --- a/javatests/google/registry/mapreduce/inputs/BUILD +++ b/javatests/google/registry/mapreduce/inputs/BUILD @@ -7,13 +7,17 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - 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", @@ -22,11 +26,6 @@ java_library( "//third_party/java/junit", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/truth", - "//java/google/registry/config", - "//java/google/registry/mapreduce/inputs", - "//java/google/registry/model", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/model/BUILD b/javatests/google/registry/model/BUILD index e06b7ae36..b03964286 100644 --- a/javatests/google/registry/model/BUILD +++ b/javatests/google/registry/model/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "model", # There be circular dependencies down thar, so just have this @@ -27,6 +26,13 @@ java_library( "//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", + "//java/google/registry/util", + "//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", @@ -35,13 +41,6 @@ java_library( "//third_party/java/junit", "//third_party/java/objectify:objectify-v4_1", "//third_party/java/truth", - "//java/google/registry/config", - "//java/google/registry/flows", - "//java/google/registry/model", - "//java/google/registry/util", - "//java/google/registry/xml", - "//javatests/google/registry/testing", - "//javatests/google/registry/xml", ], ) diff --git a/javatests/google/registry/module/backend/BUILD b/javatests/google/registry/module/backend/BUILD index 183e7e709..1037aef22 100644 --- a/javatests/google/registry/module/backend/BUILD +++ b/javatests/google/registry/module/backend/BUILD @@ -5,7 +5,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "backend", srcs = glob(["*.java"]), @@ -15,12 +14,12 @@ java_library( "//third_party/java/appengine:appengine-api-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", - "//java/google/registry/module/backend", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD index 58a09854b..85998f0ca 100644 --- a/javatests/google/registry/module/frontend/BUILD +++ b/javatests/google/registry/module/frontend/BUILD @@ -5,7 +5,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "frontend", srcs = glob(["*.java"]), @@ -15,12 +14,12 @@ java_library( "//third_party/java/appengine:appengine-api-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", - "//java/google/registry/module/frontend", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/module/tools/BUILD b/javatests/google/registry/module/tools/BUILD index 6eded4e47..dfe2e6495 100644 --- a/javatests/google/registry/module/tools/BUILD +++ b/javatests/google/registry/module/tools/BUILD @@ -5,7 +5,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "tools", srcs = glob(["*.java"]), @@ -15,11 +14,11 @@ java_library( "//third_party/java/appengine:appengine-api-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", - "//java/google/registry/module/tools", ], ) diff --git a/javatests/google/registry/monitoring/metrics/BUILD b/javatests/google/registry/monitoring/metrics/BUILD index 690462d6d..c55f471d5 100644 --- a/javatests/google/registry/monitoring/metrics/BUILD +++ b/javatests/google/registry/monitoring/metrics/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "metrics", srcs = glob(["*.java"]), @@ -19,11 +18,11 @@ java_library( "//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", - "//java/google/registry/monitoring/metrics", ], ) diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD index b6ca6d59c..b48db8528 100644 --- a/javatests/google/registry/monitoring/whitebox/BUILD +++ b/javatests/google/registry/monitoring/whitebox/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "whitebox", srcs = glob(["*.java"]), @@ -20,6 +19,14 @@ java_library( "//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", + "//java/google/registry/model", + "//java/google/registry/monitoring/whitebox", + "//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", @@ -31,14 +38,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/bigquery", - "//java/google/registry/config", - "//java/google/registry/mapreduce", - "//java/google/registry/model", - "//java/google/registry/monitoring/whitebox", - "//java/google/registry/util", - "//javatests/google/registry/testing", - "//javatests/google/registry/testing/mapreduce", ], ) diff --git a/javatests/google/registry/pricing/BUILD b/javatests/google/registry/pricing/BUILD index b84a97f31..215f2498f 100644 --- a/javatests/google/registry/pricing/BUILD +++ b/javatests/google/registry/pricing/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "pricing", srcs = glob(["*Test.java"]), @@ -16,15 +15,15 @@ java_library( "//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", - "//java/google/registry/model", - "//java/google/registry/pricing", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD index 3750ef47b..fd9ad92df 100644 --- a/javatests/google/registry/rdap/BUILD +++ b/javatests/google/registry/rdap/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "rdap", srcs = glob(["*.java"]), @@ -17,6 +16,10 @@ java_library( "//java/com/google/common/collect", "//java/com/google/common/io", "//java/com/google/common/net", + "//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", @@ -27,10 +30,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/model", - "//java/google/registry/rdap", - "//java/google/registry/request", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/rde/BUILD b/javatests/google/registry/rde/BUILD index 80dd899a9..23967310a 100644 --- a/javatests/google/registry/rde/BUILD +++ b/javatests/google/registry/rde/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "rde", srcs = glob(["*.java"]), @@ -17,6 +16,21 @@ java_library( "//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", + "//java/google/registry/mapreduce", + "//java/google/registry/model", + "//java/google/registry/rde", + "//java/google/registry/request", + "//java/google/registry/tldconfig/idn", + "//java/google/registry/util", + "//java/google/registry/xjc", + "//java/google/registry/xml", + "//javatests/google/registry/testing", + "//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", @@ -33,21 +47,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/config", - "//java/google/registry/gcs", - "//java/google/registry/keyring/api", - "//java/google/registry/mapreduce", - "//java/google/registry/model", - "//java/google/registry/rde", - "//java/google/registry/request", - "//java/google/registry/tldconfig/idn", - "//java/google/registry/util", - "//java/google/registry/xjc", - "//java/google/registry/xml", - "//javatests/google/registry/testing", - "//javatests/google/registry/testing/mapreduce", - "//javatests/google/registry/testing/sftp", - "//javatests/google/registry/xml", ], ) diff --git a/javatests/google/registry/request/BUILD b/javatests/google/registry/request/BUILD index 21be471d8..6a839aedb 100644 --- a/javatests/google/registry/request/BUILD +++ b/javatests/google/registry/request/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "request", srcs = glob(["*.java"]), @@ -16,6 +15,10 @@ java_library( "//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", @@ -24,10 +27,6 @@ java_library( "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/request", - "//java/google/registry/security", - "//javatests/google/registry/security", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/security/BUILD b/javatests/google/registry/security/BUILD index 2161b6f81..db7fc2011 100644 --- a/javatests/google/registry/security/BUILD +++ b/javatests/google/registry/security/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "security", srcs = glob( @@ -18,6 +17,9 @@ java_library( "//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", @@ -26,9 +28,6 @@ java_library( "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/security", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/server/BUILD b/javatests/google/registry/server/BUILD index 8ad85c69f..1e4844281 100644 --- a/javatests/google/registry/server/BUILD +++ b/javatests/google/registry/server/BUILD @@ -5,7 +5,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "TestServer", srcs = [ @@ -23,11 +22,11 @@ java_library( "//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", - "//java/google/registry/util", ], ) @@ -36,11 +35,11 @@ java_library( 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", - "//java/google/registry/model", - "//javatests/google/registry/testing", ], ) @@ -55,11 +54,11 @@ java_library( ":TestServer", "//java/com/google/common/collect", "//java/com/google/common/net", - "//third_party/java/jsr305_annotations", - "//third_party/java/servlet/servlet_api", "//java/google/registry/module/backend", "//java/google/registry/module/frontend", "//java/google/registry/ui/server/registrar", + "//third_party/java/jsr305_annotations", + "//third_party/java/servlet/servlet_api", ], ) @@ -72,10 +71,10 @@ java_binary( ":RegistryTestServer", "//java/com/google/common/collect", "//java/com/google/common/net", - "//third_party/java/jcommander", - "//third_party/java/junit", "//java/google/registry/tools/params", "//java/google/registry/ui", "//javatests/google/registry/testing", + "//third_party/java/jcommander", + "//third_party/java/junit", ], ) diff --git a/javatests/google/registry/storage/drive/BUILD b/javatests/google/registry/storage/drive/BUILD index a08dafda7..eb070f7aa 100644 --- a/javatests/google/registry/storage/drive/BUILD +++ b/javatests/google/registry/storage/drive/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "drive", srcs = glob(["*Test.java"]), @@ -17,11 +16,11 @@ java_library( "//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", - "//java/google/registry/storage/drive", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD index 2da6f2cec..0126d28dc 100644 --- a/javatests/google/registry/testing/BUILD +++ b/javatests/google/registry/testing/BUILD @@ -5,7 +5,6 @@ package( licenses(["notice"]) # Apache 2.0 - java_library( name = "testing", srcs = glob( @@ -29,6 +28,16 @@ java_library( "//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", + "//java/google/registry/flows", + "//java/google/registry/model", + "//java/google/registry/pricing", + "//java/google/registry/request", + "//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", @@ -48,16 +57,5 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/config", - "//java/google/registry/dns:constants", - "//java/google/registry/dns/writer", - "//java/google/registry/flows", - "//java/google/registry/model", - "//java/google/registry/pricing", - "//java/google/registry/request", - "//java/google/registry/tmch", - "//java/google/registry/util", - "//java/google/registry/xml", ], ) - diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD index 36ae79c1f..e8beee214 100644 --- a/javatests/google/registry/testing/mapreduce/BUILD +++ b/javatests/google/registry/testing/mapreduce/BUILD @@ -7,13 +7,17 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - 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", @@ -25,11 +29,6 @@ java_library( "//third_party/java/mockito", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/config", - "//java/google/registry/mapreduce", - "//java/google/registry/model", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/testing/sftp/BUILD b/javatests/google/registry/testing/sftp/BUILD index 0a342c4d7..f54950d29 100644 --- a/javatests/google/registry/testing/sftp/BUILD +++ b/javatests/google/registry/testing/sftp/BUILD @@ -5,19 +5,18 @@ package( licenses(["notice"]) # Apache 2.0 - 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", - "//java/google/registry/util", ], ) diff --git a/javatests/google/registry/tldconfig/idn/BUILD b/javatests/google/registry/tldconfig/idn/BUILD index 15dbf7085..ad213c149 100644 --- a/javatests/google/registry/tldconfig/idn/BUILD +++ b/javatests/google/registry/tldconfig/idn/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "idn", srcs = glob([ @@ -16,10 +15,10 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", - "//third_party/java/junit", - "//third_party/java/truth", "//java/google/registry/tldconfig/idn", "//javatests/google/registry/testing", + "//third_party/java/junit", + "//third_party/java/truth", ], ) diff --git a/javatests/google/registry/tmch/BUILD b/javatests/google/registry/tmch/BUILD index 2d30d1315..de79189ab 100644 --- a/javatests/google/registry/tmch/BUILD +++ b/javatests/google/registry/tmch/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "tmch", srcs = glob(["*.java"]), @@ -22,6 +21,11 @@ java_library( "//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", @@ -32,11 +36,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/tmch", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/tools/BUILD b/javatests/google/registry/tools/BUILD index 8b8a11868..d4b886bcb 100644 --- a/javatests/google/registry/tools/BUILD +++ b/javatests/google/registry/tools/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "tools", srcs = glob([ @@ -23,19 +22,6 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/reflect", - "//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", "//java/google/registry/config", "//java/google/registry/flows", "//java/google/registry/keyring/api", @@ -53,6 +39,19 @@ 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", ], ) diff --git a/javatests/google/registry/tools/params/BUILD b/javatests/google/registry/tools/params/BUILD index f710a4164..754b6a04f 100644 --- a/javatests/google/registry/tools/params/BUILD +++ b/javatests/google/registry/tools/params/BUILD @@ -5,22 +5,21 @@ package( licenses(["notice"]) # Apache 2.0 - 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", - "//java/google/registry/model", - "//java/google/registry/tools/params", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/tools/server/BUILD b/javatests/google/registry/tools/server/BUILD index 691e9cff7..ff06657ca 100644 --- a/javatests/google/registry/tools/server/BUILD +++ b/javatests/google/registry/tools/server/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "server", srcs = glob(["*.java"]), @@ -15,6 +14,15 @@ java_library( deps = [ "//java/com/google/common/base", "//java/com/google/common/collect", + "//java/google/registry/groups", + "//java/google/registry/mapreduce", + "//java/google/registry/model", + "//java/google/registry/request", + "//java/google/registry/tools/server", + "//java/google/registry/util", + "//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", @@ -26,15 +34,6 @@ java_library( "//third_party/java/re2j", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/groups", - "//java/google/registry/mapreduce", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/tools/server", - "//java/google/registry/util", - "//javatests/google/registry/model", - "//javatests/google/registry/testing", - "//javatests/google/registry/testing/mapreduce", ], ) diff --git a/javatests/google/registry/ui/forms/BUILD b/javatests/google/registry/ui/forms/BUILD index e17b05193..94be4796d 100644 --- a/javatests/google/registry/ui/forms/BUILD +++ b/javatests/google/registry/ui/forms/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "forms", srcs = glob(["*.java"]), @@ -15,13 +14,13 @@ java_library( "//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", - "//java/google/registry/ui/forms", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/ui/js/BUILD b/javatests/google/registry/ui/js/BUILD index 179d360aa..471f59776 100644 --- a/javatests/google/registry/ui/js/BUILD +++ b/javatests/google/registry/ui/js/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library", "closure_js_test") - closure_js_library( name = "testing", srcs = ["testing.js"], @@ -25,8 +24,8 @@ closure_js_test( compilation_level = "WHITESPACE_ONLY", deps = [ ":testing", - "//javascript/closure", "//java/google/registry/ui/js", + "//javascript/closure", "//javascript/closure:testing", ], ) diff --git a/javatests/google/registry/ui/js/registrar/BUILD b/javatests/google/registry/ui/js/registrar/BUILD index eff0f72bb..3161b1f1a 100644 --- a/javatests/google/registry/ui/js/registrar/BUILD +++ b/javatests/google/registry/ui/js/registrar/BUILD @@ -7,15 +7,14 @@ licenses(["notice"]) # Apache 2.0 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library", "closure_js_test") - closure_js_library( name = "console_test_util", srcs = ["console_test_util.js"], deps = [ - "//javascript/closure", - "//javascript/closure:testing", "//java/google/registry/ui/js", "//java/google/registry/ui/js/registrar", + "//javascript/closure", + "//javascript/closure:testing", ], ) @@ -27,11 +26,11 @@ closure_js_test( compilation_level = "WHITESPACE_ONLY", deps = [ ":console_test_util", - "//javascript/closure", "//java/google/registry/ui/js", "//java/google/registry/ui/js/registrar", "//java/google/registry/ui/soy/registrar:Console", - "//javatests/google/registry/ui/js:testing", + "//javascript/closure", "//javascript/closure:testing", + "//javatests/google/registry/ui/js:testing", ], ) diff --git a/javatests/google/registry/ui/server/BUILD b/javatests/google/registry/ui/server/BUILD index 435694495..1a6a1cbff 100644 --- a/javatests/google/registry/ui/server/BUILD +++ b/javatests/google/registry/ui/server/BUILD @@ -7,17 +7,16 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "server", srcs = glob(["*.java"]), deps = [ - "//third_party/java/hamcrest", - "//third_party/java/junit", - "//third_party/java/truth", "//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", ], ) diff --git a/javatests/google/registry/ui/server/registrar/BUILD b/javatests/google/registry/ui/server/registrar/BUILD index 80a46e93a..56b95f071 100644 --- a/javatests/google/registry/ui/server/registrar/BUILD +++ b/javatests/google/registry/ui/server/registrar/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "registrar", srcs = glob(["*.java"]), @@ -18,16 +17,6 @@ java_library( "//java/com/google/common/io", "//java/com/google/common/net", "//java/com/google/common/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", "//java/google/registry/braintree", "//java/google/registry/config", "//java/google/registry/export/sheet", @@ -39,6 +28,16 @@ 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", ], ) diff --git a/javatests/google/registry/util/BUILD b/javatests/google/registry/util/BUILD index f06501522..70df90ca9 100644 --- a/javatests/google/registry/util/BUILD +++ b/javatests/google/registry/util/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "util", srcs = glob(["*.java"]), @@ -18,6 +17,8 @@ java_library( "//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", @@ -25,8 +26,6 @@ java_library( "//third_party/java/mockito", "//third_party/java/re2j", "//third_party/java/truth", - "//java/google/registry/util", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/whois/BUILD b/javatests/google/registry/whois/BUILD index 3c6c6722e..e43cb4b53 100644 --- a/javatests/google/registry/whois/BUILD +++ b/javatests/google/registry/whois/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "whois", srcs = glob(["*.java"]), @@ -17,6 +16,12 @@ java_library( "//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", @@ -25,12 +30,6 @@ java_library( "//third_party/java/objectify:objectify-v4_1", "//third_party/java/servlet/servlet_api", "//third_party/java/truth", - "//java/google/registry/config", - "//java/google/registry/model", - "//java/google/registry/request", - "//java/google/registry/util", - "//java/google/registry/whois", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/xjc/BUILD b/javatests/google/registry/xjc/BUILD index 203331bac..b7c972a71 100644 --- a/javatests/google/registry/xjc/BUILD +++ b/javatests/google/registry/xjc/BUILD @@ -7,20 +7,19 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "xjc", srcs = glob(["*.java"]), resources = glob(["testdata/*.xml"]), deps = [ + "//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", - "//java/google/registry/util", - "//java/google/registry/xjc", - "//javatests/google/registry/testing", ], ) diff --git a/javatests/google/registry/xml/BUILD b/javatests/google/registry/xml/BUILD index 7fa0234a5..3398433ad 100644 --- a/javatests/google/registry/xml/BUILD +++ b/javatests/google/registry/xml/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules") - java_library( name = "xml", srcs = glob(["*.java"]), @@ -16,14 +15,14 @@ java_library( "//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", - "//java/google/registry/util", - "//java/google/registry/xml", - "//javatests/google/registry/testing", ], ) diff --git a/python/BUILD b/python/BUILD index 96d9b2277..5811ac2a6 100644 --- a/python/BUILD +++ b/python/BUILD @@ -10,7 +10,6 @@ package(default_visibility = ["//java/google/registry:registry_project"]) licenses(["notice"]) # Apache 2.0 - # NOTE: All py_library() rules under this directory should depend on this rule. # # This rule serves to add this directory (/python) to the PYTHONPATH of any diff --git a/python/google/registry/reporting/BUILD b/python/google/registry/reporting/BUILD index 4f4c7e073..5ab025da6 100644 --- a/python/google/registry/reporting/BUILD +++ b/python/google/registry/reporting/BUILD @@ -2,7 +2,6 @@ package(default_visibility = ["//java/google/registry:registry_project"]) licenses(["notice"]) # Apache 2.0 - py_library( name = "icann_report_query_builder", srcs = ["icann_report_query_builder.py"], diff --git a/third_party/java/appengine/BUILD b/third_party/java/appengine/BUILD index 86d769ada..91bc54fe0 100644 --- a/third_party/java/appengine/BUILD +++ b/third_party/java/appengine/BUILD @@ -63,10 +63,10 @@ java_library( name = "appengine-testing", testonly = 1, exports = [ - "@appengine_testing//jar", ":appengine-api-labs-testonly", ":appengine-api-testonly", ":appengine-stubs", + "@appengine_testing//jar", ], ) diff --git a/third_party/java/appengine_mapreduce2/BUILD b/third_party/java/appengine_mapreduce2/BUILD index 23ea71581..dfc460962 100644 --- a/third_party/java/appengine_mapreduce2/BUILD +++ b/third_party/java/appengine_mapreduce2/BUILD @@ -6,6 +6,11 @@ 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", "@fastutil//jar", "@google_api_client//jar", "@google_api_client_appengine//jar", @@ -16,10 +21,5 @@ java_library( "@jackson_core//jar", "@jackson_databind//jar", "@protobuf_java//jar", - "//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", ], ) diff --git a/third_party/java/appengine_pipeline/BUILD b/third_party/java/appengine_pipeline/BUILD index 42d616b1e..c8d3080ce 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 = [ - "@guava//jar", - "@json//jar", "//third_party/java/appengine_gcs_client", "//third_party/java/servlet/servlet_api", + "@guava//jar", + "@json//jar", ], ) diff --git a/third_party/java/auto/BUILD b/third_party/java/auto/BUILD index b45afe3b0..7b6e3d1a9 100644 --- a/third_party/java/auto/BUILD +++ b/third_party/java/auto/BUILD @@ -30,10 +30,10 @@ java_plugin( processor_class = "com.google.auto.factory.processor.AutoFactoryProcessor", visibility = ["//visibility:private"], deps = [ + ":auto_common", "@auto_factory//jar", "@guava//jar", "@javawriter//jar", - ":auto_common", ], ) @@ -42,9 +42,9 @@ java_plugin( processor_class = "com.google.auto.service.processor.AutoServiceProcessor", visibility = ["//visibility:private"], deps = [ + ":auto_common", "@auto_service//jar", "@guava//jar", - ":auto_common", ], ) @@ -53,9 +53,9 @@ java_plugin( processor_class = "com.google.auto.value.processor.AutoValueProcessor", visibility = ["//visibility:private"], deps = [ - "@auto_value//jar", - "@guava//jar", ":auto_common", "//third_party/java/jsr305_annotations", + "@auto_value//jar", + "@guava//jar", ], ) diff --git a/third_party/java/bouncycastle/BUILD b/third_party/java/bouncycastle/BUILD index f332d0741..a9e8f6d75 100644 --- a/third_party/java/bouncycastle/BUILD +++ b/third_party/java/bouncycastle/BUILD @@ -5,7 +5,7 @@ licenses(["notice"]) # MIT, portions under other notice licenses java_library( name = "bouncycastle", exports = [ - "@bcprov_jdk15on//jar", "//third_party/java/bouncycastle_bcpkix", + "@bcprov_jdk15on//jar", ], ) diff --git a/third_party/java/dagger/BUILD b/third_party/java/dagger/BUILD index b8727c2e7..f0b2a861c 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 = [ - "@dagger//jar", "//third_party/java/jsr330_inject", + "@dagger//jar", ], ) java_library( name = "dagger-producers", exports = [ + "//third_party/java/jsr330_inject", "@dagger_producers//jar", "@guava//jar", - "//third_party/java/jsr330_inject", ], ) @@ -29,8 +29,6 @@ java_library( visibility = ["//visibility:public"], exports = ["@dagger_compiler//jar"], runtime_deps = [ - "@gson//jar", - "@guava//jar", ":dagger-producers", ":dagger-runtime", "//third_party/java/auto:auto_common", @@ -39,6 +37,8 @@ java_library( "//third_party/java/javapoet", "//third_party/java/jsr305_annotations", "//third_party/java/jsr330_inject", + "@gson//jar", + "@guava//jar", ], )