Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Synchronize protobuf with version used in rules_closure Update rules_closure to latest version Change-Id: I615122f83ad570078b1a63a4bfbd5a33b68e298d
diff --git a/WORKSPACE b/WORKSPACE index 365fbd6..093b774 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -48,9 +48,9 @@ http_archive( name = "io_bazel_rules_closure", - sha256 = "bdb00831682cd0923df36e19b01619b8230896d582f16304a937d8dc8270b1b6", - strip_prefix = "rules_closure-ad75d7cc1cff0e845cd83683881915d995bd75b2", - urls = ["https://github.com/bazelbuild/rules_closure/archive/ad75d7cc1cff0e845cd83683881915d995bd75b2.tar.gz"], + sha256 = "75c58680af5f7b938ce9fe2abe8ecd9d24c698d160c0b71a945bd100fa77632b", + strip_prefix = "rules_closure-10cb1a78bd6cc8927eb39c2644c0369934f4aed6", + urls = ["https://github.com/bazelbuild/rules_closure/archive/10cb1a78bd6cc8927eb39c2644c0369934f4aed6.tar.gz"], ) # File is specific to Polymer and copied from the Closure Github -- should be @@ -229,12 +229,6 @@ ) maven_jar( - name = "protobuf", - artifact = "com.google.protobuf:protobuf-java:3.0.0-beta-2", - sha1 = "de80fe047052445869b96f6def6baca7182c95af", -) - -maven_jar( name = "joda-time", artifact = "joda-time:joda-time:2.9.9", sha1 = "f7b520c458572890807d143670c9b24f4de90897",
diff --git a/lib/BUILD b/lib/BUILD index 7fe6e10..7e4d2e8 100644 --- a/lib/BUILD +++ b/lib/BUILD
@@ -65,7 +65,7 @@ name = "protobuf", data = ["//lib:LICENSE-protobuf"], visibility = ["//visibility:public"], - exports = ["@protobuf//jar"], + exports = ["@com_google_protobuf//:protobuf_java"], ) java_library(