Merge pull request #1318 from smparkes/smparkes/grpc

add java/util support based on java/util/pom.xml

2 files changed, 33 insertions, 0 deletions

diff --git a/BUILD b/BUILD
index a1dd2200..2cb96b20 100644
--- a/BUILD
+++ b/BUILD
@@ -513,6 +513,19 @@ java_library(
     visibility = ["//visibility:public"],
 )
 
+java_library(
+    name = "protobuf_java_util",
+    srcs = glob([
+        "java/util/src/main/java/com/google/protobuf/util/*.java",
+    ]),
+    deps = [
+      "protobuf_java",
+      "//external:gson",
+      "//external:guava",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 ################################################################################
 # Python support
 ################################################################################
diff --git a/WORKSPACE b/WORKSPACE
index 1e8e0a7f..065dc819 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -31,3 +31,23 @@ bind(
     name = "six",
     actual = "@six_archive//:six",
 )
+
+maven_jar(
+  name = "guava_maven",
+  artifact = "com.google.guava:guava:18.0",
+)
+
+bind(
+    name = "guava",
+    actual = "@guava_maven//jar",
+)
+
+maven_jar(
+  name = "gson_maven",
+  artifact = "com.google.code.gson:gson:2.3",
+)
+
+bind(
+    name = "gson",
+    actual = "@gson_maven//jar",
+)