diff --git a/WORKSPACE b/WORKSPACE index b39d1a6fe..794e14ad5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -156,11 +156,12 @@ maven_jar( sha1 = "5a2f4be6cf41e27ed7119d26cb8f106300d87d91", ) -new_git_repository( +new_http_archive( name = "closure_library", build_file = "third_party/closure/library/closure_library.BUILD", - remote = "https://github.com/google/closure-library.git", - tag = "20160208", + sha256 = "8f610300e4930190137505a574a54d12346426f2a7b4f179026e41674e452a86", + strip_prefix = "closure-library-20160208", + url = "https://github.com/google/closure-library/archive/20160208.zip", ) maven_jar( @@ -283,6 +284,24 @@ maven_jar( sha1 = "c11014f06ade0a418b2028df41b17f3b17d9cb21", ) +maven_jar( + name = "gson", + artifact = "com.google.code.gson:gson:2.4", + sha1 = "0695b63d702f505b9b916e02272e3b6381bade7f", +) + +maven_jar( + name = "guava", + artifact = "com.google.guava:guava:19.0", + sha1 = "6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9", +) + +maven_jar( + name = "guava_testlib", + artifact = "com.google.guava:guava-testlib:19.0", + sha1 = "ce5b880b206de3f76d364988a6308c68c726f74a", +) + maven_jar( name = "guice", artifact = "com.google.inject:guice:3.0", @@ -391,6 +410,12 @@ maven_jar( sha1 = "4056712d2e6db043a38b78c4ee2130c74bae7216", ) +maven_jar( + name = "joda_time", + artifact = "joda-time:joda-time:2.3", + sha1 = "56498efd17752898cfcc3868c1b6211a07b12b8f", +) + maven_jar( name = "json", artifact = "org.json:json:20090211", @@ -403,6 +428,24 @@ maven_jar( sha1 = "c9ad4a0850ab676c5c64461a05ca524cdfff59f1", ) +maven_jar( + name = "jsr305", + artifact = "com.google.code.findbugs:jsr305:1.3.9", + sha1 = "40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf", +) + +maven_jar( + name = "jsr330_inject", + artifact = "javax.inject:javax.inject:1", + sha1 = "6975da39a7040257bd51d21a231b76c915872d38", +) + +maven_jar( + name = "junit", + artifact = "junit:junit:4.11", + sha1 = "4e031bb61df09069aeb2bffb4019e7a5034a4ee0", +) + maven_jar( name = "jzlib", artifact = "com.jcraft:jzlib:1.1.3", @@ -415,6 +458,12 @@ maven_jar( sha1 = "4ae3550e925c2621eca3ef9fb4de5298d6f91cc4", ) +maven_jar( + name = "mockito", + artifact = "org.mockito:mockito-all:1.9.5", + sha1 = "79a8984096fc6591c1e3690e07d41be506356fa5", +) + # XXX: new_http_archive() doesn't maintain the executable bit. # https://github.com/bazelbuild/bazel/issues/984 http_file( @@ -464,3 +513,9 @@ maven_jar( artifact = "org.apache.sshd:sshd-core:0.7.0", sha1 = "ef5d0cae23845dead3fc53ecd61bd990ed42f60f", ) + +maven_jar( + name = "truth", + artifact = "com.google.truth:truth:0.28", + sha1 = "0a388c7877c845ff4b8e19689dda5ac9d34622c4", +) diff --git a/java/com/google/common/annotations/BUILD b/java/com/google/common/annotations/BUILD index 83dc63314..58297d2c6 100644 --- a/java/com/google/common/annotations/BUILD +++ b/java/com/google/common/annotations/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "annotations", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/base/BUILD b/java/com/google/common/base/BUILD index ae9983e24..6eba3e505 100644 --- a/java/com/google/common/base/BUILD +++ b/java/com/google/common/base/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "base", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/cache/BUILD b/java/com/google/common/cache/BUILD index ddd09556d..3d913c43e 100644 --- a/java/com/google/common/cache/BUILD +++ b/java/com/google/common/cache/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "cache", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/collect/BUILD b/java/com/google/common/collect/BUILD index 9d0aa2c38..6d0f35ce1 100644 --- a/java/com/google/common/collect/BUILD +++ b/java/com/google/common/collect/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "collect", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/escape/BUILD b/java/com/google/common/escape/BUILD index 0d7f637c8..7a54bd037 100644 --- a/java/com/google/common/escape/BUILD +++ b/java/com/google/common/escape/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "escape", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/hash/BUILD b/java/com/google/common/hash/BUILD index ebb0fc3e7..8a77c1adb 100644 --- a/java/com/google/common/hash/BUILD +++ b/java/com/google/common/hash/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "hash", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/html/BUILD b/java/com/google/common/html/BUILD index 6cb5b22b7..ab2831582 100644 --- a/java/com/google/common/html/BUILD +++ b/java/com/google/common/html/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "html", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/io/BUILD b/java/com/google/common/io/BUILD index 5ae93fd8e..fc4ff5870 100644 --- a/java/com/google/common/io/BUILD +++ b/java/com/google/common/io/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "io", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/math/BUILD b/java/com/google/common/math/BUILD index 854080a96..e1f68496b 100644 --- a/java/com/google/common/math/BUILD +++ b/java/com/google/common/math/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "math", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/net/BUILD b/java/com/google/common/net/BUILD index e3f4da66d..c5fb2f1e7 100644 --- a/java/com/google/common/net/BUILD +++ b/java/com/google/common/net/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "net", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/primitives/BUILD b/java/com/google/common/primitives/BUILD index c85328903..67b1a20b8 100644 --- a/java/com/google/common/primitives/BUILD +++ b/java/com/google/common/primitives/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "primitives", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/reflect/BUILD b/java/com/google/common/reflect/BUILD index 121173712..5c3774099 100644 --- a/java/com/google/common/reflect/BUILD +++ b/java/com/google/common/reflect/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "reflect", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/common/testing/BUILD b/java/com/google/common/testing/BUILD index 2864a6647..95851bee1 100644 --- a/java/com/google/common/testing/BUILD +++ b/java/com/google/common/testing/BUILD @@ -3,5 +3,6 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "testing", testonly = 1, - exports = ["@bazel_tools//third_party:guava-testlib"], + exports = ["@guava_testlib//jar"], + runtime_deps = ["@guava//jar"], ) diff --git a/java/com/google/common/util/concurrent/BUILD b/java/com/google/common/util/concurrent/BUILD index f4e66ed9d..2c7344e01 100644 --- a/java/com/google/common/util/concurrent/BUILD +++ b/java/com/google/common/util/concurrent/BUILD @@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"]) java_library( name = "concurrent", - exports = ["@bazel_tools//third_party:guava"], + exports = ["@guava//jar"], ) diff --git a/java/com/google/domain/registry/tools/server/BUILD b/java/com/google/domain/registry/tools/server/BUILD index 378d9c546..6b10df66d 100644 --- a/java/com/google/domain/registry/tools/server/BUILD +++ b/java/com/google/domain/registry/tools/server/BUILD @@ -26,5 +26,6 @@ java_library( "//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/third_party/closure/stylesheets/BUILD b/third_party/closure/stylesheets/BUILD index ba28dcf5f..a8e3714d8 100644 --- a/third_party/closure/stylesheets/BUILD +++ b/third_party/closure/stylesheets/BUILD @@ -8,9 +8,9 @@ java_binary( main_class = "com.google.common.css.compiler.commandline.ClosureCommandLineCompiler", runtime_deps = [ "@args4j//jar", - "@bazel_tools//third_party:gson", - "@bazel_tools//third_party:guava", - "@bazel_tools//third_party:jsr305", "@closure_stylesheets//jar", + "@gson//jar", + "@guava//jar", + "//third_party/java/jsr305_annotations", ], ) diff --git a/third_party/closure/templates/BUILD b/third_party/closure/templates/BUILD index 93166e665..01482d286 100644 --- a/third_party/closure/templates/BUILD +++ b/third_party/closure/templates/BUILD @@ -13,13 +13,13 @@ java_library( "@asm_analysis//jar", "@asm_commons//jar", "@asm_util//jar", - "@bazel_tools//third_party:guava", - "@bazel_tools//third_party:jsr305", - "@bazel_tools//third_party:jsr330_inject", + "@guava//jar", "@guice//jar", "@guice_assistedinject//jar", "@guice_multibindings//jar", "@icu4j//jar", + "//third_party/java/jsr305_annotations", + "//third_party/java/jsr330_inject", ], ) diff --git a/third_party/java/apache_mina/BUILD b/third_party/java/apache_mina/BUILD index b41f54e5a..196ee4095 100644 --- a/third_party/java/apache_mina/BUILD +++ b/third_party/java/apache_mina/BUILD @@ -4,8 +4,6 @@ licenses(["notice"]) # Apache License 2.0 java_library( name = "core", - exports = [ - "@mina_core//jar", - "//third_party/java/slf4j_api", - ], + exports = ["@mina_core//jar"], + runtime_deps = ["//third_party/java/slf4j_api"], ) diff --git a/third_party/java/apache_sshd/BUILD b/third_party/java/apache_sshd/BUILD index 945659bf1..70f38271c 100644 --- a/third_party/java/apache_sshd/BUILD +++ b/third_party/java/apache_sshd/BUILD @@ -4,8 +4,6 @@ licenses(["notice"]) # Apache License 2.0 java_library( name = "apache_sshd", - exports = [ - "@sshd_core//jar", - "//third_party/java/apache_mina:core", - ], + exports = ["@sshd_core//jar"], + runtime_deps = ["//third_party/java/apache_mina:core"], ) diff --git a/third_party/java/appengine_gcs_client/BUILD b/third_party/java/appengine_gcs_client/BUILD index b1231a0b0..01855836c 100644 --- a/third_party/java/appengine_gcs_client/BUILD +++ b/third_party/java/appengine_gcs_client/BUILD @@ -4,8 +4,8 @@ licenses(["notice"]) # Apache License 2.0 java_library( name = "appengine_gcs_client", - exports = [ - "@appengine_gcs_client//jar", + exports = ["@appengine_gcs_client//jar"], + runtime_deps = [ "@google_api_client_appengine//jar", "@google_api_services_storage//jar", "@google_http_client_appengine//jar", diff --git a/third_party/java/appengine_mapreduce2/BUILD b/third_party/java/appengine_mapreduce2/BUILD index 3c7a0176b..23ea71581 100644 --- a/third_party/java/appengine_mapreduce2/BUILD +++ b/third_party/java/appengine_mapreduce2/BUILD @@ -4,23 +4,22 @@ licenses(["notice"]) # Apache License 2.0 java_library( name = "appengine_mapreduce", - exports = [ - "@appengine_mapreduce//jar", - "@bazel_tools//third_party:guava", - "@bazel_tools//third_party:joda_time", + exports = ["@appengine_mapreduce//jar"], + runtime_deps = [ "@fastutil//jar", "@google_api_client//jar", "@google_api_client_appengine//jar", "@google_api_services_bigquery//jar", "@google_http_client_appengine//jar", "@google_http_client_jackson2//jar", + "@guava//jar", "@jackson_core//jar", "@jackson_databind//jar", "@protobuf_java//jar", - "//third_party/java/appengine:appengine-api", "//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 be1fad6de..42d616b1e 100644 --- a/third_party/java/appengine_pipeline/BUILD +++ b/third_party/java/appengine_pipeline/BUILD @@ -4,11 +4,10 @@ licenses(["notice"]) # Apache License 2.0 java_library( name = "appengine_pipeline", - exports = [ - "@appengine_pipeline//jar", - "@bazel_tools//third_party:guava", + exports = ["@appengine_pipeline//jar"], + runtime_deps = [ + "@guava//jar", "@json//jar", - "//third_party/java/appengine:appengine-api", "//third_party/java/appengine_gcs_client", "//third_party/java/servlet/servlet_api", ], diff --git a/third_party/java/auto/BUILD b/third_party/java/auto/BUILD index 594e29494..b45afe3b0 100644 --- a/third_party/java/auto/BUILD +++ b/third_party/java/auto/BUILD @@ -31,7 +31,7 @@ java_plugin( visibility = ["//visibility:private"], deps = [ "@auto_factory//jar", - "@bazel_tools//third_party:guava", + "@guava//jar", "@javawriter//jar", ":auto_common", ], @@ -43,7 +43,7 @@ java_plugin( visibility = ["//visibility:private"], deps = [ "@auto_service//jar", - "@bazel_tools//third_party:guava", + "@guava//jar", ":auto_common", ], ) @@ -54,8 +54,8 @@ java_plugin( visibility = ["//visibility:private"], deps = [ "@auto_value//jar", - "@bazel_tools//third_party:guava", - "@bazel_tools//third_party:jsr305", + "@guava//jar", ":auto_common", + "//third_party/java/jsr305_annotations", ], ) diff --git a/third_party/java/dagger/BUILD b/third_party/java/dagger/BUILD index 9621d8307..518e4bce4 100644 --- a/third_party/java/dagger/BUILD +++ b/third_party/java/dagger/BUILD @@ -10,34 +10,34 @@ java_library( java_library( name = "dagger-runtime", exports = [ - "@bazel_tools//third_party:jsr330_inject", "@dagger//jar", + "//third_party/java/jsr330_inject", ], ) java_library( name = "dagger-producers", exports = [ - "@bazel_tools//third_party:guava", - "@bazel_tools//third_party:jsr330_inject", "@dagger_producers//jar", + "@guava//jar", + "//third_party/java/jsr330_inject", ], ) java_library( name = "dagger-compiler", - exports = [ - "@bazel_tools//third_party:auto_common", - "@bazel_tools//third_party:auto_service", - "@bazel_tools//third_party:auto_value", - "@bazel_tools//third_party:gson", - "@bazel_tools//third_party:guava", - "@bazel_tools//third_party:jsr305", - "@bazel_tools//third_party:jsr330_inject", - "@dagger_compiler//jar", + exports = ["@dagger_compiler//jar"], + runtime_deps = [ + "@gson//jar", + "@guava//jar", ":dagger-producers", ":dagger-runtime", + "//third_party/java/auto:auto_common", + "//third_party/java/auto:auto_service", + "//third_party/java/auto:auto_value", "//third_party/java/javapoet", + "//third_party/java/jsr305_annotations", + "//third_party/java/jsr330_inject", ], ) diff --git a/third_party/java/jetty/v6_1_22/BUILD b/third_party/java/jetty/v6_1_22/BUILD index 52037e0af..b38b1e2de 100644 --- a/third_party/java/jetty/v6_1_22/BUILD +++ b/third_party/java/jetty/v6_1_22/BUILD @@ -8,6 +8,6 @@ java_library( exports = [ "@jetty//jar", "@jetty_util//jar", - "@servlet_api//jar", ], + runtime_deps = ["@servlet_api//jar"], ) diff --git a/third_party/java/joda_time/BUILD b/third_party/java/joda_time/BUILD index 811a782e7..9a627dded 100644 --- a/third_party/java/joda_time/BUILD +++ b/third_party/java/joda_time/BUILD @@ -4,5 +4,5 @@ licenses(["notice"]) # Apache License 2.0 java_library( name = "joda_time", - exports = ["@bazel_tools//third_party:joda_time"], + exports = ["@joda_time//jar"], ) diff --git a/third_party/java/jsr305_annotations/BUILD b/third_party/java/jsr305_annotations/BUILD index f9f1122f4..6b55cc8fa 100644 --- a/third_party/java/jsr305_annotations/BUILD +++ b/third_party/java/jsr305_annotations/BUILD @@ -4,5 +4,5 @@ licenses(["notice"]) # BSD License java_library( name = "jsr305_annotations", - exports = ["@bazel_tools//third_party:jsr305"], + exports = ["@jsr305//jar"], ) diff --git a/third_party/java/jsr330_inject/BUILD b/third_party/java/jsr330_inject/BUILD index 6668564fb..331e86ab3 100644 --- a/third_party/java/jsr330_inject/BUILD +++ b/third_party/java/jsr330_inject/BUILD @@ -4,5 +4,5 @@ licenses(["notice"]) # Apache 2.0 java_library( name = "jsr330_inject", - exports = ["@bazel_tools//third_party:jsr330_inject"], + exports = ["@jsr330_inject//jar"], ) diff --git a/third_party/java/junit/BUILD b/third_party/java/junit/BUILD index 6b07521b7..e1bbd5ff1 100644 --- a/third_party/java/junit/BUILD +++ b/third_party/java/junit/BUILD @@ -5,5 +5,8 @@ licenses(["reciprocal"]) # Common Public License 1.0 java_library( name = "junit", testonly = 1, - exports = ["@bazel_tools//third_party:junit4"], + exports = [ + "@hamcrest_core//jar", + "@junit//jar", + ], ) diff --git a/third_party/java/mockito/BUILD b/third_party/java/mockito/BUILD index 2ef0d01e2..62456cd91 100644 --- a/third_party/java/mockito/BUILD +++ b/third_party/java/mockito/BUILD @@ -5,5 +5,5 @@ licenses(["notice"]) # MIT java_library( name = "mockito", testonly = 1, - exports = ["@bazel_tools//third_party:mockito"], + exports = ["@mockito//jar"], ) diff --git a/third_party/java/soy/BUILD b/third_party/java/soy/BUILD index 8bc1c399e..2367fce40 100644 --- a/third_party/java/soy/BUILD +++ b/third_party/java/soy/BUILD @@ -4,20 +4,20 @@ licenses(["notice"]) # Apache License 2.0 java_library( name = "soy", - exports = [ + exports = ["@soy//jar"], + runtime_deps = [ "@aopalliance//jar", "@asm//jar", "@asm_analysis//jar", "@asm_commons//jar", "@asm_util//jar", - "@bazel_tools//third_party:guava", - "@bazel_tools//third_party:jsr305", - "@bazel_tools//third_party:jsr330_inject", + "@guava//jar", "@guice//jar", "@guice_assistedinject//jar", "@guice_multibindings//jar", "@icu4j//jar", - "@soy//jar", + "//third_party/java/jsr305_annotations", + "//third_party/java/jsr330_inject", ], ) diff --git a/third_party/java/truth/BUILD b/third_party/java/truth/BUILD index 0d8d319db..49d1f3840 100644 --- a/third_party/java/truth/BUILD +++ b/third_party/java/truth/BUILD @@ -5,5 +5,5 @@ licenses(["notice"]) # Apache License 2.0 java_library( name = "truth", testonly = 1, - exports = ["@bazel_tools//third_party:truth"], + exports = ["@truth//jar"], )