diff --git a/bazel/ray.bzl b/bazel/ray.bzl index 4ba637f3cdd4..e26428bafa26 100644 --- a/bazel/ray.bzl +++ b/bazel/ray.bzl @@ -53,12 +53,13 @@ def define_java_module(name, additional_srcs = [], additional_resources = [], de size = "small", tags = ["checkstyle"], ) - -def gen_java_pom_file(name): pom_file( name = "org_ray_ray_" + name + "_pom", targets = [ ":org_ray_ray_" + name, ], template_file = name + "/pom_template.xml", + substitutions = { + "{auto_gen_header}": "", + }, ) diff --git a/java/BUILD.bazel b/java/BUILD.bazel index 2d2762d837e6..f86df8d40f96 100644 --- a/java/BUILD.bazel +++ b/java/BUILD.bazel @@ -1,4 +1,4 @@ -load("//bazel:ray.bzl", "flatbuffer_java_library", "define_java_module", "gen_java_pom_file") +load("//bazel:ray.bzl", "flatbuffer_java_library", "define_java_module") exports_files([ "testng.xml", @@ -7,27 +7,29 @@ exports_files([ "streaming/testng.xml", ]) +all_modules = [ + "api", + "runtime", + "test", + "tutorial", + "streaming", +] + java_import( name = "all_modules", jars = [ - "liborg_ray_ray_api.jar", - "liborg_ray_ray_api-src.jar", - "liborg_ray_ray_runtime.jar", - "liborg_ray_ray_runtime-src.jar", - "liborg_ray_ray_tutorial.jar", - "liborg_ray_ray_tutorial-src.jar", - "liborg_ray_ray_streaming.jar", - "liborg_ray_ray_streaming-src.jar", + "liborg_ray_ray_" + module + ".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", "streaming_tests_deploy.jar", "streaming_tests_deploy-src.jar", ], deps = [ - ":org_ray_ray_api", - ":org_ray_ray_runtime", - ":org_ray_ray_tutorial", - ":org_ray_ray_streaming", + ":org_ray_ray_" + module for module in all_modules + ] + [ ":all_tests", ":streaming_tests", ], @@ -247,30 +249,10 @@ genrule( local = 1, ) -# generate pom.xml file for maven compile -gen_java_pom_file( - name = "api", -) - -gen_java_pom_file( - name = "runtime", -) - -gen_java_pom_file( - name = "tutorial", -) - -gen_java_pom_file( - name = "test", -) - genrule( name = "copy_pom_file", srcs = [ - "//java:org_ray_ray_api_pom", - "//java:org_ray_ray_runtime_pom", - "//java:org_ray_ray_tutorial_pom", - "//java:org_ray_ray_test_pom", + "//java:org_ray_ray_" + module + "_pom" for module in all_modules ], outs = ["copy_pom_file.out"], cmd = """ @@ -280,6 +262,7 @@ genrule( cp -f $(location //java:org_ray_ray_runtime_pom) $$WORK_DIR/java/runtime/pom.xml cp -f $(location //java:org_ray_ray_tutorial_pom) $$WORK_DIR/java/tutorial/pom.xml cp -f $(location //java:org_ray_ray_test_pom) $$WORK_DIR/java/test/pom.xml + cp -f $(location //java:org_ray_ray_streaming_pom) $$WORK_DIR/java/streaming/pom.xml echo $$(date) > $@ """, local = 1, diff --git a/java/api/pom.xml b/java/api/pom.xml index c7a910cd989f..792e54f6c433 100644 --- a/java/api/pom.xml +++ b/java/api/pom.xml @@ -1,4 +1,5 @@ + @@ -16,21 +17,30 @@ jar - - org.slf4j - slf4j-log4j12 - - - javax.xml.bind - jaxb-api - - - com.sun.xml.bind - jaxb-core - - - com.sun.xml.bind - jaxb-impl - + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + javax.xml.bind + jaxb-api + 2.3.0 + + + log4j + log4j + 1.2.17 + + + org.slf4j + slf4j-log4j12 + 1.7.25 + diff --git a/java/api/pom_template.xml b/java/api/pom_template.xml index ae37175a812a..67088f9584cb 100644 --- a/java/api/pom_template.xml +++ b/java/api/pom_template.xml @@ -1,4 +1,5 @@ +{auto_gen_header} @@ -16,6 +17,6 @@ jar - {generated_bzl_deps} +{generated_bzl_deps} diff --git a/java/pom.xml b/java/pom.xml index ce5ffa2faa29..bf7a41229b9b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -20,8 +20,6 @@ 1.8 UTF-8 0.1-SNAPSHOT - 1.7.25 - 2.3.0 @@ -31,76 +29,6 @@ arrow-plasma 0.13.0-SNAPSHOT - - de.ruedigermoeller - fst - 2.47 - - - org.ow2.asm - asm - 6.0 - - - com.github.davidmoten - flatbuffers-java - 1.9.0.1 - - - com.beust - jcommander - 1.72 - - - redis.clients - jedis - 2.8.0 - - - commons-io - commons-io - 2.5 - - - org.apache.commons - commons-lang3 - 3.4 - - - com.google.guava - guava - 19.0 - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - com.typesafe - config - 1.3.2 - - - org.testng - testng - 6.9.9 - - - javax.xml.bind - jaxb-api - ${jaxb.version} - - - com.sun.xml.bind - jaxb-core - ${jaxb.version} - - - com.sun.xml.bind - jaxb-impl - ${jaxb.version} - diff --git a/java/runtime/pom.xml b/java/runtime/pom.xml index 4b2cc7d50373..c7e1730c9004 100644 --- a/java/runtime/pom.xml +++ b/java/runtime/pom.xml @@ -1,4 +1,5 @@ + @@ -21,53 +22,60 @@ ray-api ${project.version} - - com.typesafe - config - - - org.apache.commons - commons-lang3 - - - de.ruedigermoeller - fst - - - com.github.davidmoten - flatbuffers-java - - - redis.clients - jedis - org.apache.arrow arrow-plasma - - commons-io - commons-io - - - com.google.guava - guava - - - org.slf4j - slf4j-log4j12 - - - org.ow2.asm - asm - - - - - org.testng - testng - test - + + com.github.davidmoten + flatbuffers-java + 1.9.0.1 + + + com.google.guava + guava + 27.0.1-jre + + + com.typesafe + config + 1.3.2 + + + commons-io + commons-io + 2.5 + + + de.ruedigermoeller + fst + 2.47 + + + org.apache.commons + commons-lang3 + 3.4 + + + org.ow2.asm + asm + 6.0 + + + org.slf4j + slf4j-api + 1.7.25 + + + org.slf4j + slf4j-log4j12 + 1.7.25 + + + redis.clients + jedis + 2.8.0 + diff --git a/java/runtime/pom_template.xml b/java/runtime/pom_template.xml index fc75efe70398..9200bd6c6003 100644 --- a/java/runtime/pom_template.xml +++ b/java/runtime/pom_template.xml @@ -1,4 +1,5 @@ +{auto_gen_header} @@ -25,7 +26,7 @@ org.apache.arrow arrow-plasma - {generated_bzl_deps} +{generated_bzl_deps} diff --git a/java/streaming/pom.xml b/java/streaming/pom.xml index c95976373d3c..3ee6e89c401e 100644 --- a/java/streaming/pom.xml +++ b/java/streaming/pom.xml @@ -1,4 +1,5 @@ + @@ -26,17 +27,20 @@ ray-runtime ${project.version} - - org.slf4j - slf4j-log4j12 - - - com.google.guava - guava - - - org.testng - testng - + + com.google.guava + guava + 27.0.1-jre + + + org.slf4j + slf4j-api + 1.7.25 + + + org.slf4j + slf4j-log4j12 + 1.7.25 + diff --git a/java/streaming/pom_template.xml b/java/streaming/pom_template.xml new file mode 100644 index 000000000000..3551e7443e5c --- /dev/null +++ b/java/streaming/pom_template.xml @@ -0,0 +1,32 @@ + +{auto_gen_header} + + + org.ray + ray-superpom + 0.1-SNAPSHOT + + 4.0.0 + + streaming + ray streaming + ray streaming + + jar + + + + org.ray + ray-api + ${project.version} + + + org.ray + ray-runtime + ${project.version} + +{generated_bzl_deps} + + diff --git a/java/test/pom.xml b/java/test/pom.xml index afb8da564293..10f7ea4b3313 100644 --- a/java/test/pom.xml +++ b/java/test/pom.xml @@ -1,5 +1,5 @@ - + @@ -22,34 +22,46 @@ ray-api ${project.version} - org.ray ray-runtime ${project.version} - - - org.testng - testng - - - - com.google.guava - guava - + + com.google.guava + guava + 27.0.1-jre + + + commons-io + commons-io + 2.5 + + + org.apache.commons + commons-lang3 + 3.4 + + + org.slf4j + slf4j-api + 1.7.25 + + + org.testng + testng + 6.9.9 + org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M3 + 2.21.0 - false false ${basedir}/src/main/java/ - ${basedir}/src/main/resources/ ${project.build.directory}/classes/ diff --git a/java/test/pom_template.xml b/java/test/pom_template.xml index f67e735a5b80..9b8b3684f297 100644 --- a/java/test/pom_template.xml +++ b/java/test/pom_template.xml @@ -1,5 +1,5 @@ - +{auto_gen_header} @@ -22,14 +22,12 @@ ray-api ${project.version} - org.ray ray-runtime ${project.version} - - {generated_bzl_deps} +{generated_bzl_deps} diff --git a/java/tutorial/pom.xml b/java/tutorial/pom.xml index 48a03dc1ca8e..b0e78b40e15e 100644 --- a/java/tutorial/pom.xml +++ b/java/tutorial/pom.xml @@ -1,4 +1,5 @@ + ray-runtime ${project.version} + + com.google.guava + guava + 27.0.1-jre + diff --git a/java/tutorial/pom_template.xml b/java/tutorial/pom_template.xml index 3ced33cf3ac2..0f7b2fdf4693 100644 --- a/java/tutorial/pom_template.xml +++ b/java/tutorial/pom_template.xml @@ -1,4 +1,5 @@ +{auto_gen_header} ray-runtime ${project.version} - {generated_bzl_deps} +{generated_bzl_deps}