From 723fe86882f46242fa202596b7041f7f60ba89ac Mon Sep 17 00:00:00 2001
From: chaokunyang <shawn.ck.yang@gmail.com>
Date: Sat, 11 Jan 2020 14:26:28 +0800
Subject: [PATCH] [Java] Fix building Java with maven (#6764)

* lint

* gen_maven_deps for ray_java_pkg
---
 ci/travis/bazel-format.sh |  2 +-
 java/BUILD.bazel          | 57 ++++++++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/ci/travis/bazel-format.sh b/ci/travis/bazel-format.sh
index 75c6eb3e5..817ac219f 100755
--- a/ci/travis/bazel-format.sh
+++ b/ci/travis/bazel-format.sh
@@ -44,7 +44,7 @@ while [[ $# > 0 ]]; do
 done
 
 pushd $ROOT_DIR/../..
-BAZEL_FILES="bazel/BUILD bazel/BUILD.plasma bazel/ray.bzl BUILD.bazel
+BAZEL_FILES="bazel/BUILD bazel/BUILD.plasma bazel/ray.bzl BUILD.bazel java/BUILD.bazel
  streaming/BUILD.bazel streaming/java/BUILD.bazel WORKSPACE"
 buildifier -mode=$RUN_TYPE -diff_command="diff -u" $BAZEL_FILES
 popd
diff --git a/java/BUILD.bazel b/java/BUILD.bazel
index c3224a961..9159ffc7f 100644
--- a/java/BUILD.bazel
+++ b/java/BUILD.bazel
@@ -17,15 +17,18 @@ all_modules = [
 java_import(
     name = "all_modules",
     jars = [
-        "liborg_ray_ray_" + module + ".jar" for module in all_modules
+        "liborg_ray_ray_" + module + ".jar"
+        for module in all_modules
     ] + [
-        "liborg_ray_ray_" + module + "-src.jar" for module in all_modules
+        "liborg_ray_ray_" + module + "-src.jar"
+        for module in all_modules
     ] + [
         "all_tests_deploy.jar",
         "all_tests_deploy-src.jar",
     ],
     deps = [
-        ":org_ray_ray_" + module for module in all_modules
+        ":org_ray_ray_" + module
+        for module in all_modules
     ] + [
         ":all_tests",
     ],
@@ -33,28 +36,28 @@ java_import(
 
 define_java_module(
     name = "api",
+    visibility = ["//visibility:public"],
     deps = [
-        "@maven//:org_slf4j_slf4j_log4j12",
-        "@maven//:log4j_log4j",
-        "@maven//:javax_xml_bind_jaxb_api",
         "@maven//:com_sun_xml_bind_jaxb_core",
         "@maven//:com_sun_xml_bind_jaxb_impl",
+        "@maven//:javax_xml_bind_jaxb_api",
+        "@maven//:log4j_log4j",
+        "@maven//:org_slf4j_slf4j_log4j12",
     ],
-    visibility = ["//visibility:public"]
 )
 
 define_java_module(
     name = "runtime",
-    additional_srcs = [
-        ":all_java_proto",
-    ],
-    exclude_srcs = [
-        "runtime/src/main/java/org/ray/runtime/generated/*.java",
-    ],
     additional_resources = [
         ":java_native_deps",
     ],
+    additional_srcs = [
+        ":all_java_proto",
+    ],
     define_test_lib = True,
+    exclude_srcs = [
+        "runtime/src/main/java/org/ray/runtime/generated/*.java",
+    ],
     test_deps = [
         ":org_ray_ray_api",
         ":org_ray_ray_runtime",
@@ -63,6 +66,7 @@ define_java_module(
         "@maven//:org_testng_testng",
         "@maven//:commons_io_commons_io",
     ],
+    visibility = ["//visibility:public"],
     deps = [
         ":org_ray_ray_api",
         "@maven//:com_google_guava_guava",
@@ -70,14 +74,13 @@ define_java_module(
         "@maven//:com_typesafe_config",
         "@maven//:commons_io_commons_io",
         "@maven//:de_ruedigermoeller_fst",
+        "@maven//:net_java_dev_jna_jna",
         "@maven//:org_apache_commons_commons_lang3",
         "@maven//:org_ow2_asm_asm",
         "@maven//:org_slf4j_slf4j_api",
         "@maven//:org_slf4j_slf4j_log4j12",
         "@maven//:redis_clients_jedis",
-        "@maven//:net_java_dev_jna_jna",
     ],
-    visibility = ["//visibility:public"]
 )
 
 define_java_module(
@@ -107,12 +110,12 @@ define_java_module(
 
 java_binary(
     name = "all_tests",
-    main_class = "org.testng.TestNG",
-    data = ["testng.xml"],
     args = ["java/testng.xml"],
+    data = ["testng.xml"],
+    main_class = "org.testng.TestNG",
     runtime_deps = [
-        ":org_ray_ray_test",
         ":org_ray_ray_runtime_test",
+        ":org_ray_ray_test",
     ],
 )
 
@@ -144,17 +147,17 @@ genrule(
     outs = ["plasma_store_server"],
     cmd = """
         cp -f $(location @plasma//:plasma_store_server) $@
-    """
+    """,
 )
 
 filegroup(
     name = "java_native_deps",
     srcs = [
-        "//:redis-server",
+        ":cp_plasma_store_server",
+        "//:core_worker_library_java",
         "//:libray_redis_module.so",
         "//:raylet",
-        "//:core_worker_library_java",
-        ":cp_plasma_store_server",
+        "//:redis-server",
     ],
 )
 
@@ -192,7 +195,8 @@ genrule(
 genrule(
     name = "copy_pom_file",
     srcs = [
-        "//java:org_ray_ray_" + module + "_pom" for module in all_modules
+        "//java:org_ray_ray_" + module + "_pom"
+        for module in all_modules
     ],
     outs = ["copy_pom_file.out"],
     cmd = """
@@ -218,12 +222,15 @@ java_binary(
         "//java:org_ray_ray_runtime",
         "//streaming/java:org_ray_ray_streaming-api",
         "//streaming/java:org_ray_ray_streaming-runtime",
-    ]
+    ],
 )
 
 genrule(
     name = "ray_java_pkg",
-    srcs = ["//java:ray_dist_deploy.jar"],
+    srcs = [
+        "//java:ray_dist_deploy.jar",
+        "//java:gen_maven_deps",
+    ],
     outs = ["ray_java_pkg.out"],
     cmd = """
         WORK_DIR=$$(pwd)