From 41ebbd6120b31a2ee9fc069f70500e0fa439a04f Mon Sep 17 00:00:00 2001 From: Deepak Sadashiva Date: Tue, 12 Mar 2024 13:49:24 -0700 Subject: [PATCH 1/2] testing bazel PR deps --- WORKSPACE | 23 +++++++++++++++++++++++ maven_install.json | 13 +++++++++++++ tensorflow/java/BUILD | 8 ++++++++ 3 files changed, 44 insertions(+) create mode 100644 maven_install.json diff --git a/WORKSPACE b/WORKSPACE index a697405110e206..85d8660f4dd5be 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -19,6 +19,29 @@ http_archive( url = "https://github.com/bazelbuild/rules_python/releases/download/0.26.0/rules_python-0.26.0.tar.gz", ) +# Add rules_jvm_external for Maven dependencies +RULES_JVM_EXTERNAL_TAG = "4.5" +RULES_JVM_EXTERNAL_SHA = "b17d7388feb9a8a510e42e1f79c3b94799953d03e12ead565bf9d3e33f1b74ba" + +http_archive( + name = "rules_jvm_external", + strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, + sha256 = RULES_JVM_EXTERNAL_SHA, + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, +) + +load("@rules_jvm_external//:defs.bzl", "maven_install") + +# Install logback-core Maven dependency +maven_install( + artifacts = [ + "maven_install.json", + ], + repositories = [ + "https://repo1.maven.org/maven2", + ], +) + load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/maven_install.json b/maven_install.json new file mode 100644 index 00000000000000..268380dc420533 --- /dev/null +++ b/maven_install.json @@ -0,0 +1,13 @@ +{ + "artifacts": [ + { + "group": "ch.qos.logback", + "artifact": "logback-core", + "version": "1.0.13", + "sha1": "dc6e6ce937347bd4d990fc89f4ceb469db53e45e" + } + ], + "repositories": [ + "https://repo1.maven.org/maven2" + ] +} diff --git a/tensorflow/java/BUILD b/tensorflow/java/BUILD index c529b2bcffa1f2..5927c9315d2550 100644 --- a/tensorflow/java/BUILD +++ b/tensorflow/java/BUILD @@ -14,6 +14,14 @@ load( "tf_java_test", ) +load("@rules_jvm_external//:defs.bzl", "maven_jar") + +maven_jar( + name = "logback-core", + artifact = "ch.qos.logback:logback-core:1.0.13", + sha1 = "dc6e6ce937347bd4d990fc89f4ceb469db53e45e", +) + package( # copybara:uncomment default_applicable_licenses = ["//tensorflow:license"], default_visibility = ["//visibility:private"], From d142aa2be69aa0bb280806c7b787a661238012d3 Mon Sep 17 00:00:00 2001 From: Deepak Sadashiva Date: Tue, 12 Mar 2024 14:05:22 -0700 Subject: [PATCH 2/2] testing bazel PR deps --- WORKSPACE | 23 +++++++++++++++++++++++ maven_install.json | 1 + tensorflow/java/BUILD | 8 ++++++++ 3 files changed, 32 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index 85d8660f4dd5be..141953c34ce052 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -56,6 +56,29 @@ python_repository(name = "python_version_repo") load("@python_version_repo//:py_version.bzl", "TF_PYTHON_VERSION") +# Add rules_jvm_external for Maven dependencies +RULES_JVM_EXTERNAL_TAG = "4.5" +RULES_JVM_EXTERNAL_SHA = "b17d7388feb9a8a510e42e1f79c3b94799953d03e12ead565bf9d3e33f1b74ba" + +http_archive( + name = "rules_jvm_external", + strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, + sha256 = RULES_JVM_EXTERNAL_SHA, + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, +) + +load("@rules_jvm_external//:defs.bzl", "maven_install") + +# Install logback-core Maven dependency +maven_install( + artifacts = [ + "maven_install.json", + ], + repositories = [ + "https://repo1.maven.org/maven2", + ], +) + python_register_toolchains( name = "python", ignore_root_user_error = True, diff --git a/maven_install.json b/maven_install.json index 268380dc420533..311f254466b887 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,3 +1,4 @@ + { "artifacts": [ { diff --git a/tensorflow/java/BUILD b/tensorflow/java/BUILD index 5927c9315d2550..0133064b71e264 100644 --- a/tensorflow/java/BUILD +++ b/tensorflow/java/BUILD @@ -22,6 +22,14 @@ maven_jar( sha1 = "dc6e6ce937347bd4d990fc89f4ceb469db53e45e", ) +load("@rules_jvm_external//:defs.bzl", "maven_jar") + +maven_jar( + name = "logback-core", + artifact = "ch.qos.logback:logback-core:1.0.13", + sha1 = "dc6e6ce937347bd4d990fc89f4ceb469db53e45e", +) + package( # copybara:uncomment default_applicable_licenses = ["//tensorflow:license"], default_visibility = ["//visibility:private"],