Skip to content

Commit ffd596d

Browse files
authored
Fix pom file generation (#4800)
1 parent 9f2645d commit ffd596d

File tree

4 files changed

+28
-6
lines changed

4 files changed

+28
-6
lines changed

bazel/ray.bzl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ def flatbuffer_java_library(name, srcs, outs, out_prefix, includes = [], include
2525
)
2626

2727
def define_java_module(name, additional_srcs = [], additional_resources = [], define_test_lib = False, test_deps = [], **kwargs):
28+
lib_name = "org_ray_ray_" + name
29+
pom_file_targets = [lib_name]
2830
native.java_library(
29-
name = "org_ray_ray_" + name,
31+
name = lib_name,
3032
srcs = additional_srcs + native.glob([name + "/src/main/java/**/*.java"]),
3133
resources = native.glob([name + "/src/main/resources/**"]) + additional_resources,
3234
**kwargs
@@ -40,8 +42,10 @@ def define_java_module(name, additional_srcs = [], additional_resources = [], de
4042
tags = ["checkstyle"],
4143
)
4244
if define_test_lib:
45+
test_lib_name = "org_ray_ray_" + name + "_test"
46+
pom_file_targets.append(test_lib_name)
4347
native.java_library(
44-
name = "org_ray_ray_" + name + "_test",
48+
name = test_lib_name,
4549
srcs = native.glob([name + "/src/test/java/**/*.java"]),
4650
deps = test_deps,
4751
)
@@ -55,9 +59,7 @@ def define_java_module(name, additional_srcs = [], additional_resources = [], de
5559
)
5660
pom_file(
5761
name = "org_ray_ray_" + name + "_pom",
58-
targets = [
59-
":org_ray_ray_" + name,
60-
],
62+
targets = pom_file_targets,
6163
template_file = name + "/pom_template.xml",
6264
substitutions = {
6365
"{auto_gen_header}": "<!-- This file is auto-generated by Bazel from pom_template.xml, do not modify it. -->",

java/runtime/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<groupId>org.apache.arrow</groupId>
2727
<artifactId>arrow-plasma</artifactId>
2828
</dependency>
29+
<dependency>
30+
<groupId>com.beust</groupId>
31+
<artifactId>jcommander</artifactId>
32+
<version>1.72</version>
33+
</dependency>
2934
<dependency>
3035
<groupId>com.github.davidmoten</groupId>
3136
<artifactId>flatbuffers-java</artifactId>
@@ -71,6 +76,11 @@
7176
<artifactId>slf4j-log4j12</artifactId>
7277
<version>1.7.25</version>
7378
</dependency>
79+
<dependency>
80+
<groupId>org.testng</groupId>
81+
<artifactId>testng</artifactId>
82+
<version>6.9.9</version>
83+
</dependency>
7484
<dependency>
7585
<groupId>redis.clients</groupId>
7686
<artifactId>jedis</artifactId>

java/streaming/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<artifactId>ray-runtime</artifactId>
2828
<version>${project.version}</version>
2929
</dependency>
30+
<dependency>
31+
<groupId>com.beust</groupId>
32+
<artifactId>jcommander</artifactId>
33+
<version>1.72</version>
34+
</dependency>
3035
<dependency>
3136
<groupId>com.google.guava</groupId>
3237
<artifactId>guava</artifactId>
@@ -41,6 +46,11 @@
4146
<groupId>org.slf4j</groupId>
4247
<artifactId>slf4j-log4j12</artifactId>
4348
<version>1.7.25</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.testng</groupId>
52+
<artifactId>testng</artifactId>
53+
<version>6.9.9</version>
4454
</dependency>
4555
</dependencies>
4656
</project>

java/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ popd
3838

3939
pushd $ROOT_DIR
4040
echo "Testing maven install."
41-
mvn clean install -Dmaven.test.skip
41+
mvn clean install -DskipTests
4242
popd

0 commit comments

Comments
 (0)