diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD index ae6ddf7cb..3779addd8 100644 --- a/java/google/registry/backup/BUILD +++ b/java/google/registry/backup/BUILD @@ -16,7 +16,7 @@ java_library( "//java/google/registry/request", "//java/google/registry/request/auth", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_appengine_tools_appengine_mapreduce", diff --git a/java/google/registry/batch/BUILD b/java/google/registry/batch/BUILD index 16853707a..f438f8239 100644 --- a/java/google/registry/batch/BUILD +++ b/java/google/registry/batch/BUILD @@ -21,7 +21,7 @@ java_library( "//java/google/registry/request:modules", "//java/google/registry/request/auth", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_apis_google_api_services_bigquery", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_tools_appengine_gcs_client", diff --git a/java/google/registry/cron/BUILD b/java/google/registry/cron/BUILD index 21ac68160..e30e26a73 100644 --- a/java/google/registry/cron/BUILD +++ b/java/google/registry/cron/BUILD @@ -12,7 +12,7 @@ java_library( "//java/google/registry/request", "//java/google/registry/request/auth", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", "@com_google_dagger", diff --git a/java/google/registry/dns/BUILD b/java/google/registry/dns/BUILD index bdb5bc3d0..df9ce81c3 100644 --- a/java/google/registry/dns/BUILD +++ b/java/google/registry/dns/BUILD @@ -28,7 +28,7 @@ java_library( "//java/google/registry/request/auth", "//java/google/registry/request/lock", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_auto_value", "@com_google_code_findbugs_jsr305", diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD index a333ef32c..33644fb92 100644 --- a/java/google/registry/export/BUILD +++ b/java/google/registry/export/BUILD @@ -19,7 +19,7 @@ java_library( "//java/google/registry/request/auth", "//java/google/registry/storage/drive", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_api_client", "@com_google_apis_google_api_services_bigquery", "@com_google_apis_google_api_services_drive", diff --git a/java/google/registry/export/sheet/BUILD b/java/google/registry/export/sheet/BUILD index 982d6be49..63a10d9d1 100644 --- a/java/google/registry/export/sheet/BUILD +++ b/java/google/registry/export/sheet/BUILD @@ -14,7 +14,7 @@ java_library( "//java/google/registry/request/auth", "//java/google/registry/request/lock", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_api_client", "@com_google_apis_google_api_services_sheets", "@com_google_appengine_api_1_0_sdk", diff --git a/java/google/registry/flows/BUILD b/java/google/registry/flows/BUILD index 3f28e0f2e..5b567ef0a 100644 --- a/java/google/registry/flows/BUILD +++ b/java/google/registry/flows/BUILD @@ -35,7 +35,7 @@ java_library( "//java/google/registry/tmch", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_auto_value", "@com_google_code_findbugs_jsr305", diff --git a/java/google/registry/keyring/kms/BUILD b/java/google/registry/keyring/kms/BUILD index ce7760fb1..0bb760903 100644 --- a/java/google/registry/keyring/kms/BUILD +++ b/java/google/registry/keyring/kms/BUILD @@ -12,7 +12,7 @@ java_library( "//java/google/registry/keyring/api", "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_api_client", "@com_google_apis_google_api_services_cloudkms", "@com_google_auto_value", diff --git a/java/google/registry/loadtest/BUILD b/java/google/registry/loadtest/BUILD index 55254321d..75a9ebba1 100644 --- a/java/google/registry/loadtest/BUILD +++ b/java/google/registry/loadtest/BUILD @@ -14,7 +14,7 @@ java_library( "//java/google/registry/request/auth", "//java/google/registry/security", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_dagger", "@com_google_guava", diff --git a/java/google/registry/mapreduce/BUILD b/java/google/registry/mapreduce/BUILD index bf6c4d650..e0acb238a 100644 --- a/java/google/registry/mapreduce/BUILD +++ b/java/google/registry/mapreduce/BUILD @@ -12,7 +12,7 @@ java_library( "//java/google/registry/model", "//java/google/registry/request", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_tools_appengine_mapreduce", "@com_google_appengine_tools_appengine_pipeline", diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD index 74390a6e0..6ef427eeb 100644 --- a/java/google/registry/mapreduce/inputs/BUILD +++ b/java/google/registry/mapreduce/inputs/BUILD @@ -10,7 +10,7 @@ java_library( deps = [ "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_tools_appengine_mapreduce", "@com_google_appengine_tools_appengine_pipeline", diff --git a/java/google/registry/model/BUILD b/java/google/registry/model/BUILD index 34d2c83f8..aa92f47b6 100644 --- a/java/google/registry/model/BUILD +++ b/java/google/registry/model/BUILD @@ -17,7 +17,7 @@ java_library( "//java/google/registry/monitoring/metrics", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_auto_value", "@com_google_code_findbugs_jsr305", diff --git a/java/google/registry/monitoring/whitebox/BUILD b/java/google/registry/monitoring/whitebox/BUILD index 2254efbad..2fcefebe3 100644 --- a/java/google/registry/monitoring/whitebox/BUILD +++ b/java/google/registry/monitoring/whitebox/BUILD @@ -16,7 +16,7 @@ java_library( "//java/google/registry/request", "//java/google/registry/request/auth", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_api_client", "@com_google_apis_google_api_services_bigquery", "@com_google_apis_google_api_services_monitoring", diff --git a/java/google/registry/pricing/BUILD b/java/google/registry/pricing/BUILD index 86681fa84..e2e9cc130 100644 --- a/java/google/registry/pricing/BUILD +++ b/java/google/registry/pricing/BUILD @@ -10,7 +10,7 @@ java_library( deps = [ "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_code_findbugs_jsr305", "@com_google_dagger", "@com_google_guava", diff --git a/java/google/registry/rdap/BUILD b/java/google/registry/rdap/BUILD index 0b69e4198..af35e99dd 100644 --- a/java/google/registry/rdap/BUILD +++ b/java/google/registry/rdap/BUILD @@ -16,7 +16,7 @@ java_library( "//java/google/registry/request/auth", "//java/google/registry/ui/server/registrar", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_auto_value", "@com_google_code_findbugs_jsr305", "@com_google_dagger", diff --git a/java/google/registry/rde/BUILD b/java/google/registry/rde/BUILD index 63b71bd1a..e47c654f3 100644 --- a/java/google/registry/rde/BUILD +++ b/java/google/registry/rde/BUILD @@ -21,8 +21,8 @@ java_library( "//java/google/registry/util", "//java/google/registry/xjc", "//java/google/registry/xml", - "//third_party/java/jsch/v0_1_53", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/jsch/v0_1_53", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_appengine_tools_appengine_mapreduce", diff --git a/java/google/registry/rde/imports/BUILD b/java/google/registry/rde/imports/BUILD index fb594b3ee..57aa56fb1 100644 --- a/java/google/registry/rde/imports/BUILD +++ b/java/google/registry/rde/imports/BUILD @@ -20,7 +20,7 @@ java_library( "//java/google/registry/util", "//java/google/registry/xjc", "//java/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_appengine_tools_appengine_mapreduce", diff --git a/java/google/registry/security/BUILD b/java/google/registry/security/BUILD index 4d6155398..e2f7fac06 100644 --- a/java/google/registry/security/BUILD +++ b/java/google/registry/security/BUILD @@ -13,7 +13,7 @@ java_library( deps = [ "//java/google/registry/model", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", "@com_google_guava", diff --git a/java/google/registry/tldconfig/idn/BUILD b/java/google/registry/tldconfig/idn/BUILD index 146979bbf..02d3404dc 100644 --- a/java/google/registry/tldconfig/idn/BUILD +++ b/java/google/registry/tldconfig/idn/BUILD @@ -10,7 +10,7 @@ java_library( resources = glob(["*.txt"]), deps = [ "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_code_findbugs_jsr305", "@com_google_guava", "@com_google_re2j", diff --git a/java/google/registry/tmch/BUILD b/java/google/registry/tmch/BUILD index 22b63c96f..5fc8417dc 100644 --- a/java/google/registry/tmch/BUILD +++ b/java/google/registry/tmch/BUILD @@ -20,7 +20,7 @@ java_library( "//java/google/registry/request/auth", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", "@com_google_dagger", diff --git a/java/google/registry/tools/BUILD b/java/google/registry/tools/BUILD index 76d710112..65285bffd 100644 --- a/java/google/registry/tools/BUILD +++ b/java/google/registry/tools/BUILD @@ -65,7 +65,7 @@ java_library( "//java/google/registry/whois", "//java/google/registry/xjc", "//java/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_beust_jcommander", "@com_google_api_client", "@com_google_apis_google_api_services_bigquery", diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD index 451797a8d..ae66ec2ba 100644 --- a/java/google/registry/tools/server/BUILD +++ b/java/google/registry/tools/server/BUILD @@ -20,7 +20,7 @@ java_library( "//java/google/registry/request", "//java/google/registry/request/auth", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_beust_jcommander", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_tools_appengine_gcs_client", diff --git a/java/google/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD index 324a0bae7..897085ea8 100644 --- a/java/google/registry/ui/server/registrar/BUILD +++ b/java/google/registry/ui/server/registrar/BUILD @@ -25,7 +25,7 @@ java_library( "//java/google/registry/ui/soy:soy_java_wrappers", "//java/google/registry/ui/soy/registrar:soy_java_wrappers", "//java/google/registry/util", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_braintreepayments_gateway_braintree_java", "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD index 0ecef15cd..b25751b5b 100644 --- a/java/google/registry/util/BUILD +++ b/java/google/registry/util/BUILD @@ -8,7 +8,7 @@ java_library( name = "util", srcs = glob(["*.java"]), deps = [ - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", "@com_google_dagger", diff --git a/java/google/registry/whois/BUILD b/java/google/registry/whois/BUILD index 847a5a2bb..3c2b8b1a5 100644 --- a/java/google/registry/whois/BUILD +++ b/java/google/registry/whois/BUILD @@ -15,7 +15,7 @@ java_library( "//java/google/registry/request/auth", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_auto_value", "@com_google_code_findbugs_jsr305", diff --git a/javatests/google/registry/backup/BUILD b/javatests/google/registry/backup/BUILD index d04d5eef3..a9421b242 100644 --- a/javatests/google/registry/backup/BUILD +++ b/javatests/google/registry/backup/BUILD @@ -17,7 +17,7 @@ java_library( "//java/google/registry/util", "//javatests/google/registry/testing", "//javatests/google/registry/testing/mapreduce", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_code_findbugs_jsr305", diff --git a/javatests/google/registry/batch/BUILD b/javatests/google/registry/batch/BUILD index 0ad96ff6e..aa519cd66 100644 --- a/javatests/google/registry/batch/BUILD +++ b/javatests/google/registry/batch/BUILD @@ -19,7 +19,7 @@ java_library( "//java/google/registry/util", "//javatests/google/registry/testing", "//javatests/google/registry/testing/mapreduce", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_apis_google_api_services_bigquery", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_api_stubs", diff --git a/javatests/google/registry/cron/BUILD b/javatests/google/registry/cron/BUILD index 0e4d31259..4d9238c35 100644 --- a/javatests/google/registry/cron/BUILD +++ b/javatests/google/registry/cron/BUILD @@ -15,7 +15,7 @@ java_library( "//java/google/registry/model", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_api_stubs", "@com_google_appengine_testing", diff --git a/javatests/google/registry/dns/BUILD b/javatests/google/registry/dns/BUILD index 388cd8a3f..e141fe529 100644 --- a/javatests/google/registry/dns/BUILD +++ b/javatests/google/registry/dns/BUILD @@ -22,7 +22,7 @@ java_library( "//java/google/registry/request", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_api_stubs", "@com_google_code_findbugs_jsr305", diff --git a/javatests/google/registry/dns/writer/clouddns/BUILD b/javatests/google/registry/dns/writer/clouddns/BUILD index c4229e502..69e47986b 100644 --- a/javatests/google/registry/dns/writer/clouddns/BUILD +++ b/javatests/google/registry/dns/writer/clouddns/BUILD @@ -15,7 +15,7 @@ java_library( "//java/google/registry/model", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_apis_google_api_services_dns", "@com_google_code_findbugs_jsr305", "@com_google_guava", diff --git a/javatests/google/registry/dns/writer/dnsupdate/BUILD b/javatests/google/registry/dns/writer/dnsupdate/BUILD index 53f4c80f0..a479796d7 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/BUILD +++ b/javatests/google/registry/dns/writer/dnsupdate/BUILD @@ -14,7 +14,7 @@ java_library( "//java/google/registry/dns/writer/dnsupdate", "//java/google/registry/model", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_code_findbugs_jsr305", "@com_google_dagger", "@com_google_guava", diff --git a/javatests/google/registry/export/BUILD b/javatests/google/registry/export/BUILD index 7de0082e2..7dfd368ab 100644 --- a/javatests/google/registry/export/BUILD +++ b/javatests/google/registry/export/BUILD @@ -27,7 +27,7 @@ java_library( "//java/google/registry/util", "//javatests/google/registry/testing", "//javatests/google/registry/testing/mapreduce", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_apis_google_api_services_bigquery", "@com_google_apis_google_api_services_drive", "@com_google_appengine_api_1_0_sdk//:testonly", diff --git a/javatests/google/registry/export/sheet/BUILD b/javatests/google/registry/export/sheet/BUILD index 0b19b52df..1666a2c9b 100644 --- a/javatests/google/registry/export/sheet/BUILD +++ b/javatests/google/registry/export/sheet/BUILD @@ -13,7 +13,7 @@ java_library( "//java/google/registry/export/sheet", "//java/google/registry/model", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_apis_google_api_services_sheets", "@com_google_code_findbugs_jsr305", "@com_google_guava", diff --git a/javatests/google/registry/flows/BUILD b/javatests/google/registry/flows/BUILD index 794f455f1..b8523e332 100644 --- a/javatests/google/registry/flows/BUILD +++ b/javatests/google/registry/flows/BUILD @@ -39,7 +39,7 @@ java_library( "//javatests/google/registry/model", "//javatests/google/registry/testing", "//javatests/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_testing", "@com_google_code_findbugs_jsr305", diff --git a/javatests/google/registry/keyring/api/BUILD b/javatests/google/registry/keyring/api/BUILD index 1b49d0997..adc6f54a3 100644 --- a/javatests/google/registry/keyring/api/BUILD +++ b/javatests/google/registry/keyring/api/BUILD @@ -19,7 +19,6 @@ java_library( "@junit", "@org_bouncycastle_bcpg_jdk15on", "@org_bouncycastle_bcpkix_jdk15on", - "@org_hamcrest_library", "@org_mockito_all", ], ) diff --git a/javatests/google/registry/keyring/kms/BUILD b/javatests/google/registry/keyring/kms/BUILD index 7fed01d4c..5855597ef 100644 --- a/javatests/google/registry/keyring/kms/BUILD +++ b/javatests/google/registry/keyring/kms/BUILD @@ -20,7 +20,7 @@ java_library( "//java/google/registry/model", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_api_client", "@com_google_apis_google_api_services_cloudkms", "@com_google_code_findbugs_jsr305", diff --git a/javatests/google/registry/mapreduce/inputs/BUILD b/javatests/google/registry/mapreduce/inputs/BUILD index 8c53770b9..ffa04e340 100644 --- a/javatests/google/registry/mapreduce/inputs/BUILD +++ b/javatests/google/registry/mapreduce/inputs/BUILD @@ -16,7 +16,7 @@ java_library( "//java/google/registry/model", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_testing", "@com_google_appengine_tools_appengine_mapreduce", diff --git a/javatests/google/registry/model/BUILD b/javatests/google/registry/model/BUILD index 18b9339c0..fa52101af 100644 --- a/javatests/google/registry/model/BUILD +++ b/javatests/google/registry/model/BUILD @@ -28,7 +28,7 @@ java_library( "//java/google/registry/xml", "//javatests/google/registry/testing", "//javatests/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_testing", "@com_google_code_findbugs_jsr305", diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD index a625891a7..3d42d2c50 100644 --- a/javatests/google/registry/monitoring/whitebox/BUILD +++ b/javatests/google/registry/monitoring/whitebox/BUILD @@ -19,7 +19,7 @@ java_library( "//java/google/registry/util", "//javatests/google/registry/testing", "//javatests/google/registry/testing/mapreduce", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_apis_google_api_services_bigquery", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_api_stubs", diff --git a/javatests/google/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD index 4f3b6678f..6983da762 100644 --- a/javatests/google/registry/rdap/BUILD +++ b/javatests/google/registry/rdap/BUILD @@ -21,7 +21,7 @@ java_library( "//java/google/registry/ui/server/registrar", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_code_findbugs_jsr305", "@com_google_dagger", diff --git a/javatests/google/registry/rde/BUILD b/javatests/google/registry/rde/BUILD index 740da7b21..a5b8c19ae 100644 --- a/javatests/google/registry/rde/BUILD +++ b/javatests/google/registry/rde/BUILD @@ -27,8 +27,8 @@ java_library( "//javatests/google/registry/testing/mapreduce", "//javatests/google/registry/testing/sftp", "//javatests/google/registry/xml", - "//third_party/java/jsch/v0_1_53", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/jsch/v0_1_53", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_code_findbugs_jsr305", @@ -42,7 +42,6 @@ java_library( "@org_apache_ftpserver_core", "@org_bouncycastle_bcpg_jdk15on", "@org_bouncycastle_bcpkix_jdk15on", - "@org_hamcrest_library", "@org_joda_money", "@org_mockito_all", ], diff --git a/javatests/google/registry/rde/imports/BUILD b/javatests/google/registry/rde/imports/BUILD index 64b088d31..93a4f124e 100644 --- a/javatests/google/registry/rde/imports/BUILD +++ b/javatests/google/registry/rde/imports/BUILD @@ -22,7 +22,7 @@ java_library( "//java/google/registry/xjc", "//javatests/google/registry/testing", "//javatests/google/registry/testing/mapreduce", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_code_findbugs_jsr305", diff --git a/javatests/google/registry/request/auth/BUILD b/javatests/google/registry/request/auth/BUILD index 6fb97a9e1..20effe527 100644 --- a/javatests/google/registry/request/auth/BUILD +++ b/javatests/google/registry/request/auth/BUILD @@ -16,7 +16,7 @@ java_library( "//java/google/registry/request/auth", "//java/google/registry/security", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_appengine_tools_sdk", diff --git a/javatests/google/registry/request/lock/BUILD b/javatests/google/registry/request/lock/BUILD index 222db1dc1..641e15e90 100644 --- a/javatests/google/registry/request/lock/BUILD +++ b/javatests/google/registry/request/lock/BUILD @@ -15,7 +15,7 @@ java_library( "//java/google/registry/model", "//java/google/registry/request/lock", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_appengine_tools_sdk", diff --git a/javatests/google/registry/server/BUILD b/javatests/google/registry/server/BUILD index 63942dd88..39d159dab 100644 --- a/javatests/google/registry/server/BUILD +++ b/javatests/google/registry/server/BUILD @@ -32,7 +32,7 @@ java_library( deps = [ "//java/google/registry/model", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_guava", "@joda_time", @@ -51,7 +51,7 @@ java_library( "//java/google/registry/model", "//java/google/registry/module/backend", "//java/google/registry/module/frontend", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_code_findbugs_jsr305", "@com_google_guava", "@javax_servlet_api", diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD index 7bfedbe13..41ec72877 100644 --- a/javatests/google/registry/testing/BUILD +++ b/javatests/google/registry/testing/BUILD @@ -34,7 +34,7 @@ java_library( "//java/google/registry/tmch", "//java/google/registry/util", "//java/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_api_stubs", "@com_google_appengine_testing", diff --git a/javatests/google/registry/tmch/BUILD b/javatests/google/registry/tmch/BUILD index df90894f5..1de3d9e42 100644 --- a/javatests/google/registry/tmch/BUILD +++ b/javatests/google/registry/tmch/BUILD @@ -23,7 +23,7 @@ java_library( "//java/google/registry/tmch", "//java/google/registry/util", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_code_findbugs_jsr305", "@com_google_guava", diff --git a/javatests/google/registry/tools/BUILD b/javatests/google/registry/tools/BUILD index eac99cb52..2446cc7ed 100644 --- a/javatests/google/registry/tools/BUILD +++ b/javatests/google/registry/tools/BUILD @@ -36,7 +36,7 @@ java_library( "//javatests/google/registry/testing", "//javatests/google/registry/tools/server", "//javatests/google/registry/xml", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_beust_jcommander", "@com_google_api_client", "@com_google_apis_google_api_services_dns", diff --git a/javatests/google/registry/tools/server/BUILD b/javatests/google/registry/tools/server/BUILD index 59abc5240..8f048d16d 100644 --- a/javatests/google/registry/tools/server/BUILD +++ b/javatests/google/registry/tools/server/BUILD @@ -22,7 +22,7 @@ java_library( "//javatests/google/registry/model", "//javatests/google/registry/testing", "//javatests/google/registry/testing/mapreduce", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_tools_appengine_gcs_client", "@com_google_appengine_tools_appengine_mapreduce", diff --git a/javatests/google/registry/ui/forms/BUILD b/javatests/google/registry/ui/forms/BUILD index a520d1b97..3ad9546df 100644 --- a/javatests/google/registry/ui/forms/BUILD +++ b/javatests/google/registry/ui/forms/BUILD @@ -19,7 +19,6 @@ java_library( "@com_google_truth", "@com_google_truth_extensions_truth_java8_extension", "@junit", - "@org_hamcrest_library", "@org_mockito_all", ], ) diff --git a/javatests/google/registry/ui/server/registrar/BUILD b/javatests/google/registry/ui/server/registrar/BUILD index 9e08eaef3..19a93213d 100644 --- a/javatests/google/registry/ui/server/registrar/BUILD +++ b/javatests/google/registry/ui/server/registrar/BUILD @@ -24,7 +24,7 @@ java_library( "//java/google/registry/util", "//javatests/google/registry/security", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_braintreepayments_gateway_braintree_java", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_guava", diff --git a/javatests/google/registry/whois/BUILD b/javatests/google/registry/whois/BUILD index d7752213a..d4117375d 100644 --- a/javatests/google/registry/whois/BUILD +++ b/javatests/google/registry/whois/BUILD @@ -18,7 +18,7 @@ java_library( "//java/google/registry/util", "//java/google/registry/whois", "//javatests/google/registry/testing", - "//third_party/java/objectify:objectify-v4_1", + "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_testing", "@com_google_dagger", diff --git a/javatests/google/registry/xjc/BUILD b/javatests/google/registry/xjc/BUILD index 0b81ba775..a0942c3a9 100644 --- a/javatests/google/registry/xjc/BUILD +++ b/javatests/google/registry/xjc/BUILD @@ -20,7 +20,6 @@ java_library( "@com_google_truth", "@com_google_truth_extensions_truth_java8_extension", "@junit", - "@org_hamcrest_library", ], ) diff --git a/third_party/jsch/BUILD b/third_party/jsch/BUILD index 139c72fa6..9db01323a 100644 --- a/third_party/jsch/BUILD +++ b/third_party/jsch/BUILD @@ -4,5 +4,5 @@ licenses(["notice"]) # BSD java_library( name = "jsch", - exports = ["//third_party/java/jsch/v0_1_53"], + exports = ["//third_party/jsch/v0_1_53"], ) diff --git a/third_party/jsch/v0_1_53/BUILD b/third_party/jsch/v0_1_53/BUILD index 88a35c987..19618544d 100644 --- a/third_party/jsch/v0_1_53/BUILD +++ b/third_party/jsch/v0_1_53/BUILD @@ -1,6 +1,6 @@ package_group( name = "specific_version", - packages = ["//third_party/java/jsch"], + packages = ["//third_party/jsch"], ) package(default_visibility = ["//visibility:public"]) diff --git a/third_party/java/jsch/v0_1_53/LICENSE b/third_party/jsch/v0_1_53/LICENSE similarity index 100% rename from third_party/java/jsch/v0_1_53/LICENSE rename to third_party/jsch/v0_1_53/LICENSE diff --git a/third_party/java/jsch/v0_1_53/README.md b/third_party/jsch/v0_1_53/README.md similarity index 100% rename from third_party/java/jsch/v0_1_53/README.md rename to third_party/jsch/v0_1_53/README.md diff --git a/third_party/java/jsch/v0_1_53/jsch-0.1.53-src.jar b/third_party/jsch/v0_1_53/jsch-0.1.53-src.jar similarity index 100% rename from third_party/java/jsch/v0_1_53/jsch-0.1.53-src.jar rename to third_party/jsch/v0_1_53/jsch-0.1.53-src.jar diff --git a/third_party/java/jsch/v0_1_53/jsch-0.1.53.jar b/third_party/jsch/v0_1_53/jsch-0.1.53.jar similarity index 100% rename from third_party/java/jsch/v0_1_53/jsch-0.1.53.jar rename to third_party/jsch/v0_1_53/jsch-0.1.53.jar diff --git a/third_party/objectify/BUILD b/third_party/objectify/BUILD index 5ff1b3c28..f1e3e804d 100644 --- a/third_party/objectify/BUILD +++ b/third_party/objectify/BUILD @@ -4,5 +4,5 @@ licenses(["notice"]) # MIT/X11 java_library( name = "objectify-v4_1", - exports = ["//third_party/java/objectify/v4_1"], + exports = ["//third_party/objectify/v4_1"], ) diff --git a/third_party/objectify/v4_1/BUILD b/third_party/objectify/v4_1/BUILD index e8a65a331..793c9a146 100644 --- a/third_party/objectify/v4_1/BUILD +++ b/third_party/objectify/v4_1/BUILD @@ -1,6 +1,6 @@ package_group( name = "specific_version", - packages = ["//third_party/java/objectify"], + packages = ["//third_party/objectify"], ) package(default_visibility = ["//visibility:public"]) diff --git a/third_party/java/objectify/v4_1/LICENSE b/third_party/objectify/v4_1/LICENSE similarity index 100% rename from third_party/java/objectify/v4_1/LICENSE rename to third_party/objectify/v4_1/LICENSE diff --git a/third_party/java/objectify/v4_1/objectify-4.1.3-src.jar b/third_party/objectify/v4_1/objectify-4.1.3-src.jar similarity index 100% rename from third_party/java/objectify/v4_1/objectify-4.1.3-src.jar rename to third_party/objectify/v4_1/objectify-4.1.3-src.jar diff --git a/third_party/java/objectify/v4_1/objectify-4.1.3.jar b/third_party/objectify/v4_1/objectify-4.1.3.jar similarity index 100% rename from third_party/java/objectify/v4_1/objectify-4.1.3.jar rename to third_party/objectify/v4_1/objectify-4.1.3.jar