From fa2851ce78b37601f64f818d92e251634ac1bb39 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 23 Mar 2017 06:44:51 +0100
Subject: [PATCH] bazel: Consume hamcrest through transitive dependency

In I3ab958ce8 explicit dependency in lib/BUILD were defined and most
of the bazel build implementation was switched to using it. Switch
test.bzl test implementation to using explicit dependencies as well.

Change-Id: I4413d1a45addeeb2a980d07669fa034c2eebb3a4
Signed-off-by: David Ostrovsky <david@ostrovsky.org>
---
 lib/BUILD                       | 20 ++++----------------
 org.eclipse.jgit.test/tests.bzl |  9 +++------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/lib/BUILD b/lib/BUILD
index 10a916bdd..827e6b6fc 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -34,18 +34,6 @@ java_library(
     exports = ["@gson//jar"],
 )
 
-java_library(
-    name = "hamcrest-core",
-    testonly = 1,
-    exports = ["@hamcrest_core//jar"],
-)
-
-java_library(
-    name = "hamcrest-library",
-    testonly = 1,
-    exports = ["@hamcrest_library//jar"],
-)
-
 java_library(
     name = "httpclient",
     visibility = [
@@ -126,10 +114,10 @@ java_library(
     name = "junit",
     testonly = 1,
     visibility = ["//visibility:public"],
-    exports = ["@junit//jar"],
-    runtime_deps = [
-        ":hamcrest-core",
-        ":hamcrest-library",
+    exports = [
+       "@junit//jar",
+       "@hamcrest_core//jar",
+       "@hamcrest_library//jar",
     ],
 )
 
diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl
index d5cc2c986..9cadc7463 100644
--- a/org.eclipse.jgit.test/tests.bzl
+++ b/org.eclipse.jgit.test/tests.bzl
@@ -37,15 +37,12 @@ def tests(tests):
       deps = additional_deps + [
         ':helpers',
         ':tst_rsrc',
+        '//lib:javaewah',
+        '//lib:junit',
+        '//lib:slf4j-api',
         '//org.eclipse.jgit:jgit',
         '//org.eclipse.jgit.junit:junit',
         '//org.eclipse.jgit.lfs:jgit-lfs',
-        '@hamcrest_core//jar',
-        '@hamcrest_library//jar',
-        '@javaewah//jar',
-        '@junit//jar',
-        '@log_api//jar',
-        '@slf4j_simple//jar',
       ],
       jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
     )