diff options
| author |  Justine Tunney <jart@google.com> | 2017-02-28 17:49:47 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-02-28 18:16:52 -0800 |
| commit | 0899b36d623d40c1a67d789c9d2b8c6a1f139643 (patch) | |
| tree | e19a9f3270040e1fcea441d393fcde327d1a9760 | |
| parent | 0e7edf20ee67c4e2ece258649147f8e9f2027f6b (diff) | |
Use best practices junit definition
Change: 148839605
| -rw-r--r-- | tensorflow/java/BUILD | 12 | ||||
| -rw-r--r-- | tensorflow/workspace.bzl | 32 |
2 files changed, 29 insertions, 15 deletions
diff --git a/tensorflow/java/BUILD b/tensorflow/java/BUILD index cc024cf6c3..78ef152689 100644 --- a/tensorflow/java/BUILD +++ b/tensorflow/java/BUILD @@ -38,7 +38,7 @@ java_test( deps = [ ":tensorflow", ":testutil", - "//external:junit", + "@junit", ], ) @@ -50,7 +50,7 @@ java_test( deps = [ ":tensorflow", ":testutil", - "//external:junit", + "@junit", ], ) @@ -62,7 +62,7 @@ java_test( deps = [ ":tensorflow", ":testutil", - "//external:junit", + "@junit", ], ) @@ -74,7 +74,7 @@ java_test( deps = [ ":tensorflow", ":testutil", - "//external:junit", + "@junit", ], ) @@ -85,7 +85,7 @@ java_test( test_class = "org.tensorflow.TensorFlowTest", deps = [ ":tensorflow", - "//external:junit", + "@junit", ], ) @@ -97,7 +97,7 @@ java_test( deps = [ ":tensorflow", ":testutil", - "//external:junit", + "@junit", ], ) diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 246c83931c..4885baf038 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -1,5 +1,6 @@ # TensorFlow external dependencies that can be loaded in WORKSPACE files. +load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external") load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external") load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external") load("//third_party/gpus:cuda_configure.bzl", "cuda_configure") @@ -413,16 +414,29 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): build_file = str(Label("//third_party:nccl.BUILD")), ) - # Make junit-4.12 available as //external:junit - native.maven_jar( - name = "junit_junit", - artifact = "junit:junit:4.12", - sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec", - ) - - native.bind( + java_import_external( name = "junit", - actual = "@junit_junit//jar", + jar_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a", + jar_urls = [ + "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar", + "http://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar", + "http://maven.ibiblio.org/maven2/junit/junit/4.12/junit-4.12.jar", + ], + licenses = ["reciprocal"], # Common Public License Version 1.0 + testonly_ = True, + deps = ["@org_hamcrest_core"], + ) + + java_import_external( + name = "org_hamcrest_core", + jar_sha256 = "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", + jar_urls = [ + "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", + "http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", + "http://maven.ibiblio.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", + ], + licenses = ["notice"], # New BSD License + testonly_ = True, ) temp_workaround_http_archive( |