Browse Source

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>
stable-4.7
David Ostrovsky 8 years ago
parent
commit
fa2851ce78
  1. 20
      lib/BUILD
  2. 9
      org.eclipse.jgit.test/tests.bzl

20
lib/BUILD

@ -34,18 +34,6 @@ java_library(
exports = ["@gson//jar"], 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( java_library(
name = "httpclient", name = "httpclient",
visibility = [ visibility = [
@ -126,10 +114,10 @@ java_library(
name = "junit", name = "junit",
testonly = 1, testonly = 1,
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
exports = ["@junit//jar"], exports = [
runtime_deps = [ "@junit//jar",
":hamcrest-core", "@hamcrest_core//jar",
":hamcrest-library", "@hamcrest_library//jar",
], ],
) )

9
org.eclipse.jgit.test/tests.bzl

@ -37,15 +37,12 @@ def tests(tests):
deps = additional_deps + [ deps = additional_deps + [
':helpers', ':helpers',
':tst_rsrc', ':tst_rsrc',
'//lib:javaewah',
'//lib:junit',
'//lib:slf4j-api',
'//org.eclipse.jgit:jgit', '//org.eclipse.jgit:jgit',
'//org.eclipse.jgit.junit:junit', '//org.eclipse.jgit.junit:junit',
'//org.eclipse.jgit.lfs:jgit-lfs', '//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"], jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
) )

Loading…
Cancel
Save