Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky2017-03-23 05:44:51 +0000
committerDavid Ostrovsky2017-03-23 05:47:49 +0000
commitfa2851ce78b37601f64f818d92e251634ac1bb39 (patch)
tree0f62df8cc39ecb035634acda4264f8a24045ccb7
parent61f830d3a27f7eb9364bd3aff42c7a7d372162a7 (diff)
downloadjgit-fa2851ce78b37601f64f818d92e251634ac1bb39.tar.gz
jgit-fa2851ce78b37601f64f818d92e251634ac1bb39.tar.xz
jgit-fa2851ce78b37601f64f818d92e251634ac1bb39.zip
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>
-rw-r--r--lib/BUILD20
-rw-r--r--org.eclipse.jgit.test/tests.bzl9
2 files changed, 7 insertions, 22 deletions
diff --git a/lib/BUILD b/lib/BUILD
index 10a916bddb..827e6b6fc6 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -35,18 +35,6 @@ java_library(
)
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 = [
"//org.eclipse.jgit.http.apache:__pkg__",
@@ -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 d5cc2c9868..9cadc7463a 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"],
)

Back to the top