Restructure Maven dependencies in build

We're now using java_import_external instead of maven_jar. This allows us to specify the relationships between jars, thereby allowing us to eliminate scores of vendor BUILD files that did nothing but re-export @foo//jar targets, thus addressing the concerns of djhworld on Hacker News: https://news.ycombinator.com/item?id=12738072 We now have redundant failover mirrors, which is a feature I added to Bazel 0.4.2 in ed7ced0018 A new standard naming convention is now being used for all Maven repos. Those names are calculated from the group_artifact name using the following algorithm that eliminates redundancy: https://gist.github.com/jart/41bfd977b913c2301627162f1c038e55 The JSR330 dep has been removed from java targets if they also depend on Dagger, since Dagger always exports JSR330. Annotation processor dependencies should now be leaner and meaner, by more appropriately managing what needs to be on the classpath at runtime. This should trim down the production jar by >1MB. As it stands currently in the open source world: - backend_jar_deploy.jar: 50MB - frontend_jar_deploy.jar: 30MB - tools_jar_deploy.jar: 45MB ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=143487929
2025-06-27 14:54:51 +02:00 · 2017-01-03 14:43:25 -08:00 · 2017-01-03 14:43:25 -08:00 · 734130aa73
commit 734130aa73
parent 0b112f17a7
112 changed files with 1574 additions and 1172 deletions
--- a/java/com/google/api/client/extensions/appengine/http/BUILD
+++ b/java/com/google/api/client/extensions/appengine/http/BUILD
@ -1,10 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "http",
-    exports = [
-        "@google_api_client//jar",
-        "@google_api_client_appengine//jar",
-        "@google_http_client_appengine//jar",
-    ],
-)
--- a/java/com/google/api/client/googleapis/auth/oauth2/BUILD
+++ b/java/com/google/api/client/googleapis/auth/oauth2/BUILD
@ -1,10 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "oauth2",
-    exports = [
-        "@google_api_client//jar",
-        "@google_http_client//jar",
-        "@google_oauth_client//jar",
-    ],
-)
--- a/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/BUILD
+++ b/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/BUILD
@ -1,10 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "oauth2",
-    exports = [
-        "@google_api_client//jar",
-        "@google_api_client_appengine//jar",
-        "@google_oauth_client_appengine//jar",
-    ],
-)
--- a/java/com/google/api/client/googleapis/json/BUILD
+++ b/java/com/google/api/client/googleapis/json/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "json",
-    exports = ["@google_api_client//jar"],
-)
--- a/java/com/google/api/client/http/BUILD
+++ b/java/com/google/api/client/http/BUILD
@ -1,9 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "http",
-    exports = [
-        "@google_api_client//jar",
-        "@google_http_client//jar",
-    ],
-)
--- a/java/com/google/api/client/http/javanet/BUILD
+++ b/java/com/google/api/client/http/javanet/BUILD
@ -1,9 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "javanet",
-    exports = [
-        "@google_api_client//jar",
-        "@google_http_client//jar",
-    ],
-)
--- a/java/com/google/api/client/json/BUILD
+++ b/java/com/google/api/client/json/BUILD
@ -1,9 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "json",
-    exports = [
-        "@google_api_client//jar",
-        "@google_http_client//jar",
-    ],
-)
--- a/java/com/google/api/client/json/jackson2/BUILD
+++ b/java/com/google/api/client/json/jackson2/BUILD
@ -1,12 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "jackson2",
-    exports = [
-        "@google_api_client//jar",
-        "@google_http_client_jackson2//jar",
-    ],
-    runtime_deps = [
-        "@jackson_core//jar",
-    ],
-)
--- a/java/com/google/api/client/testing/http/BUILD
+++ b/java/com/google/api/client/testing/http/BUILD
@ -1,9 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "http",
-    exports = [
-        "@google_api_client//jar",
-        "@google_http_client//jar",
-    ],
-)
--- a/java/com/google/api/client/util/BUILD
+++ b/java/com/google/api/client/util/BUILD
@ -1,9 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "util",
-    exports = [
-        "@google_api_client//jar",
-        "@google_http_client//jar",
-    ],
-)
--- a/java/com/google/common/annotations/BUILD
+++ b/java/com/google/common/annotations/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "annotations",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/base/BUILD
+++ b/java/com/google/common/base/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "base",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/cache/BUILD
+++ b/java/com/google/common/cache/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "cache",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/collect/BUILD
+++ b/java/com/google/common/collect/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "collect",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/escape/BUILD
+++ b/java/com/google/common/escape/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "escape",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/hash/BUILD
+++ b/java/com/google/common/hash/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "hash",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/html/BUILD
+++ b/java/com/google/common/html/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "html",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/io/BUILD
+++ b/java/com/google/common/io/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "io",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/math/BUILD
+++ b/java/com/google/common/math/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "math",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/net/BUILD
+++ b/java/com/google/common/net/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "net",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/primitives/BUILD
+++ b/java/com/google/common/primitives/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "primitives",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/reflect/BUILD
+++ b/java/com/google/common/reflect/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "reflect",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/common/testing/BUILD
+++ b/java/com/google/common/testing/BUILD
@ -1,8 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "testing",
-    testonly = 1,
-    exports = ["@guava_testlib//jar"],
-    runtime_deps = ["@guava//jar"],
-)
--- a/java/com/google/common/util/concurrent/BUILD
+++ b/java/com/google/common/util/concurrent/BUILD
@ -1,6 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "concurrent",
-    exports = ["@guava//jar"],
-)
--- a/java/com/google/gdata/BUILD
+++ b/java/com/google/gdata/BUILD
@ -1,11 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "gdata",
-    exports = ["@gdata_core//jar"],
-)
-
-java_library(
-    name = "spreadsheet",
-    exports = ["@gdata_core//jar"],
-)
--- a/java/google/registry/BUILD
+++ b/java/google/registry/BUILD
@ -19,11 +19,11 @@ package_group(
 zip_file(
    name = "common_war",
    srcs = [
-        "@appengine_api_sdk//jar",
+        "@com_google_appengine_api_1_0_sdk",
    ],
    out = "mandatory_stuff.war",
    mappings = {
-        "appengine_api_sdk/jar": "WEB-INF/lib",
+        "com_google_appengine_api_1_0_sdk": "WEB-INF/lib",
    },
    visibility = ["//visibility:private"],
 )
--- a/java/google/registry/backup/BUILD
+++ b/java/google/registry/backup/BUILD
@ -20,7 +20,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_guava",
        "@com_googlecode_json_simple",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/batch/BUILD
+++ b/java/google/registry/batch/BUILD
@ -32,7 +32,6 @@ java_library(
        "@com_google_guava",
        "@com_google_http_client",
        "@com_googlecode_json_simple",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
        "@org_joda_money",
--- a/java/google/registry/bigquery/BUILD
+++ b/java/google/registry/bigquery/BUILD
@ -20,7 +20,6 @@ java_library(
        "@com_google_http_client",
        "@com_google_http_client_appengine",
        "@com_google_http_client_jackson2",
-        "@javax_inject",
        "@joda_time",
    ],
 )
--- a/java/google/registry/braintree/BUILD
+++ b/java/google/registry/braintree/BUILD
@ -15,6 +15,5 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
    ],
 )
--- a/java/google/registry/cron/BUILD
+++ b/java/google/registry/cron/BUILD
@ -16,7 +16,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/dns/BUILD
+++ b/java/google/registry/dns/BUILD
@ -32,7 +32,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/dns/writer/dnsupdate/BUILD
+++ b/java/google/registry/dns/writer/dnsupdate/BUILD
@ -16,7 +16,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_guava",
        "@dnsjava",
-        "@javax_inject",
        "@joda_time",
    ],
 )
--- a/java/google/registry/eclipse/BUILD
+++ b/java/google/registry/eclipse/BUILD
@ -8,11 +8,12 @@ java_binary(
    name = "annotation_processors_ide",
    create_executable = False,
    runtime_deps = [
-        "@auto_factory//jar",
-        "@auto_service//jar",
-        "@auto_value//jar",
+        "@com_google_auto_common",
+        "@com_google_auto_factory//:processor",
+        "@com_google_auto_service//:processor",
+        "@com_google_auto_value//:processor",
        "@com_google_dagger_compiler",
-        "@javawriter//jar",
+        "@com_squareup_javawriter",
    ],
 )

--- a/java/google/registry/export/BUILD
+++ b/java/google/registry/export/BUILD
@ -33,7 +33,6 @@ java_library(
        "@com_google_http_client_appengine",
        "@com_google_http_client_jackson2",
        "@com_googlecode_json_simple",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/export/sheet/BUILD
+++ b/java/google/registry/export/sheet/BUILD
@ -19,7 +19,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_gdata_core",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/flows/BUILD
+++ b/java/google/registry/flows/BUILD
@ -42,7 +42,6 @@ java_library(
        "@com_google_guava",
        "@com_googlecode_json_simple",
        "@io_bazel_rules_closure//closure/templates",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
        "@org_joda_money",
--- a/java/google/registry/gcs/BUILD
+++ b/java/google/registry/gcs/BUILD
@ -14,6 +14,5 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
    ],
 )
--- a/java/google/registry/loadtest/BUILD
+++ b/java/google/registry/loadtest/BUILD
@ -17,7 +17,6 @@ java_library(
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/mapreduce/BUILD
+++ b/java/google/registry/mapreduce/BUILD
@ -18,7 +18,6 @@ java_library(
        "@com_google_appengine_tools_appengine_pipeline",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/mapreduce/inputs/BUILD
+++ b/java/google/registry/mapreduce/inputs/BUILD
@ -16,7 +16,6 @@ java_library(
        "@com_google_appengine_tools_appengine_pipeline",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/model/BUILD
+++ b/java/google/registry/model/BUILD
@ -22,7 +22,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_guava",
        "@com_google_re2j",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
        "@org_joda_money",
--- a/java/google/registry/module/backend/BUILD
+++ b/java/google/registry/module/backend/BUILD
@ -37,7 +37,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
        "@org_bouncycastle_bcpkix_jdk15on",
--- a/java/google/registry/module/frontend/BUILD
+++ b/java/google/registry/module/frontend/BUILD
@ -26,7 +26,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@org_bouncycastle_bcpkix_jdk15on",
    ],
--- a/java/google/registry/module/tools/BUILD
+++ b/java/google/registry/module/tools/BUILD
@ -27,7 +27,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@org_bouncycastle_bcpkix_jdk15on",
    ],
--- a/java/google/registry/monitoring/metrics/BUILD
+++ b/java/google/registry/monitoring/metrics/BUILD
@ -18,7 +18,6 @@ java_library(
        "@com_google_guava",
        "@com_google_http_client",
        "@com_google_re2j",
-        "@javax_inject",
        "@joda_time",
    ],
 )
--- a/java/google/registry/monitoring/whitebox/BUILD
+++ b/java/google/registry/monitoring/whitebox/BUILD
@ -23,7 +23,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_guava",
        "@com_google_http_client",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/pricing/BUILD
+++ b/java/google/registry/pricing/BUILD
@ -14,7 +14,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
        "@org_joda_money",
--- a/java/google/registry/rdap/BUILD
+++ b/java/google/registry/rdap/BUILD
@ -19,7 +19,6 @@ java_library(
        "@com_google_guava",
        "@com_google_re2j",
        "@com_googlecode_json_simple",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/rde/BUILD
+++ b/java/google/registry/rde/BUILD
@ -30,7 +30,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_guava",
        "@com_google_re2j",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
        "@org_bouncycastle_bcpg_jdk15on",
--- a/java/google/registry/rde/imports/BUILD
+++ b/java/google/registry/rde/imports/BUILD
@ -24,7 +24,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/repositories.bzl
+++ b/java/google/registry/repositories.bzl
--- a/java/google/registry/request/BUILD
+++ b/java/google/registry/request/BUILD
@ -19,7 +19,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_guava",
        "@com_googlecode_json_simple",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/storage/drive/BUILD
+++ b/java/google/registry/storage/drive/BUILD
@ -13,7 +13,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_guava",
        "@com_google_http_client",
-        "@javax_inject",
        "@joda_time",
    ],
 )
--- a/java/google/registry/tmch/BUILD
+++ b/java/google/registry/tmch/BUILD
@ -25,7 +25,6 @@ java_library(
        "@com_google_dagger",
        "@com_google_guava",
        "@com_google_re2j",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
        "@org_bouncycastle_bcpg_jdk15on",
--- a/java/google/registry/tools/BUILD
+++ b/java/google/registry/tools/BUILD
@ -68,7 +68,6 @@ java_library(
        "@com_google_re2j",
        "@com_googlecode_json_simple",
        "@io_bazel_rules_closure//closure/templates",
-        "@javax_inject",
        "@joda_time",
        "@org_bouncycastle_bcpg_jdk15on",
        "@org_bouncycastle_bcpkix_jdk15on",
--- a/java/google/registry/tools/server/BUILD
+++ b/java/google/registry/tools/server/BUILD
@ -26,7 +26,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
        "@org_joda_money",
--- a/java/google/registry/tools/server/javascrap/BUILD
+++ b/java/google/registry/tools/server/javascrap/BUILD
@ -20,7 +20,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@joda_time",
    ],
 )
--- a/java/google/registry/ui/server/registrar/BUILD
+++ b/java/google/registry/ui/server/registrar/BUILD
@ -32,7 +32,6 @@ java_library(
        "@com_google_guava",
        "@com_google_re2j",
        "@io_bazel_rules_closure//closure/templates",
-        "@javax_inject",
        "@javax_servlet_api",
        "@org_joda_money",
    ],
--- a/java/google/registry/util/BUILD
+++ b/java/google/registry/util/BUILD
@ -16,7 +16,6 @@ java_library(
        "@com_google_guava",
        "@com_google_re2j",
        "@com_ibm_icu_icu4j",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],
--- a/java/google/registry/whois/BUILD
+++ b/java/google/registry/whois/BUILD
@ -18,7 +18,6 @@ java_library(
        "@com_google_code_findbugs_jsr305",
        "@com_google_dagger",
        "@com_google_guava",
-        "@javax_inject",
        "@javax_servlet_api",
        "@joda_time",
    ],