Skip to content

Commit 643f62d

Browse files
raulchenraulchen
authored
[Java][Bazel] Refine auto-generated pom files (#4780)
1 parent cb1a195 commit 643f62d

File tree

13 files changed

+186
-201
lines changed

13 files changed

+186
-201
lines changed

‎bazel/ray.bzl

+3-2
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@ def define_java_module(name, additional_srcs = [], additional_resources = [], de
5353
size = "small",
5454
tags = ["checkstyle"],
5555
)
56-
57-
def gen_java_pom_file(name):
5856
pom_file(
5957
name = "org_ray_ray_" + name + "_pom",
6058
targets = [
6159
":org_ray_ray_" + name,
6260
],
6361
template_file = name + "/pom_template.xml",
62+
substitutions = {
63+
"{auto_gen_header}": "<!-- This file is auto-generated by Bazel from pom_template.xml, do not modify it. -->",
64+
},
6465
)

‎java/BUILD.bazel

+17-34
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//bazel:ray.bzl", "flatbuffer_java_library", "define_java_module", "gen_java_pom_file")
1+
load("//bazel:ray.bzl", "flatbuffer_java_library", "define_java_module")
22

33
exports_files([
44
"testng.xml",
@@ -7,27 +7,29 @@ exports_files([
77
"streaming/testng.xml",
88
])
99

10+
all_modules = [
11+
"api",
12+
"runtime",
13+
"test",
14+
"tutorial",
15+
"streaming",
16+
]
17+
1018
java_import(
1119
name = "all_modules",
1220
jars = [
13-
"liborg_ray_ray_api.jar",
14-
"liborg_ray_ray_api-src.jar",
15-
"liborg_ray_ray_runtime.jar",
16-
"liborg_ray_ray_runtime-src.jar",
17-
"liborg_ray_ray_tutorial.jar",
18-
"liborg_ray_ray_tutorial-src.jar",
19-
"liborg_ray_ray_streaming.jar",
20-
"liborg_ray_ray_streaming-src.jar",
21+
"liborg_ray_ray_" + module + ".jar" for module in all_modules
22+
] + [
23+
"liborg_ray_ray_" + module + "-src.jar" for module in all_modules
24+
] + [
2125
"all_tests_deploy.jar",
2226
"all_tests_deploy-src.jar",
2327
"streaming_tests_deploy.jar",
2428
"streaming_tests_deploy-src.jar",
2529
],
2630
deps = [
27-
":org_ray_ray_api",
28-
":org_ray_ray_runtime",
29-
":org_ray_ray_tutorial",
30-
":org_ray_ray_streaming",
31+
":org_ray_ray_" + module for module in all_modules
32+
] + [
3133
":all_tests",
3234
":streaming_tests",
3335
],
@@ -247,30 +249,10 @@ genrule(
247249
local = 1,
248250
)
249251

250-
# generate pom.xml file for maven compile
251-
gen_java_pom_file(
252-
name = "api",
253-
)
254-
255-
gen_java_pom_file(
256-
name = "runtime",
257-
)
258-
259-
gen_java_pom_file(
260-
name = "tutorial",
261-
)
262-
263-
gen_java_pom_file(
264-
name = "test",
265-
)
266-
267252
genrule(
268253
name = "copy_pom_file",
269254
srcs = [
270-
"//java:org_ray_ray_api_pom",
271-
"//java:org_ray_ray_runtime_pom",
272-
"//java:org_ray_ray_tutorial_pom",
273-
"//java:org_ray_ray_test_pom",
255+
"//java:org_ray_ray_" + module + "_pom" for module in all_modules
274256
],
275257
outs = ["copy_pom_file.out"],
276258
cmd = """
@@ -280,6 +262,7 @@ genrule(
280262
cp -f $(location //java:org_ray_ray_runtime_pom) $$WORK_DIR/java/runtime/pom.xml
281263
cp -f $(location //java:org_ray_ray_tutorial_pom) $$WORK_DIR/java/tutorial/pom.xml
282264
cp -f $(location //java:org_ray_ray_test_pom) $$WORK_DIR/java/test/pom.xml
265+
cp -f $(location //java:org_ray_ray_streaming_pom) $$WORK_DIR/java/streaming/pom.xml
283266
echo $$(date) > $@
284267
""",
285268
local = 1,

‎java/api/pom.xml

+26-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- This file is auto-generated by Bazel from pom_template.xml, do not modify it. -->
23
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xmlns="http://maven.apache.org/POM/4.0.0"
45
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -16,21 +17,30 @@
1617
<packaging>jar</packaging>
1718

1819
<dependencies>
19-
<dependency>
20-
<groupId>org.slf4j</groupId>
21-
<artifactId>slf4j-log4j12</artifactId>
22-
</dependency>
23-
<dependency>
24-
<groupId>javax.xml.bind</groupId>
25-
<artifactId>jaxb-api</artifactId>
26-
</dependency>
27-
<dependency>
28-
<groupId>com.sun.xml.bind</groupId>
29-
<artifactId>jaxb-core</artifactId>
30-
</dependency>
31-
<dependency>
32-
<groupId>com.sun.xml.bind</groupId>
33-
<artifactId>jaxb-impl</artifactId>
34-
</dependency>
20+
<dependency>
21+
<groupId>com.sun.xml.bind</groupId>
22+
<artifactId>jaxb-core</artifactId>
23+
<version>2.3.0</version>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.sun.xml.bind</groupId>
27+
<artifactId>jaxb-impl</artifactId>
28+
<version>2.3.0</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>javax.xml.bind</groupId>
32+
<artifactId>jaxb-api</artifactId>
33+
<version>2.3.0</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>log4j</groupId>
37+
<artifactId>log4j</artifactId>
38+
<version>1.2.17</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.slf4j</groupId>
42+
<artifactId>slf4j-log4j12</artifactId>
43+
<version>1.7.25</version>
44+
</dependency>
3545
</dependencies>
3646
</project>

‎java/api/pom_template.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
{auto_gen_header}
23
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xmlns="http://maven.apache.org/POM/4.0.0"
45
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -16,6 +17,6 @@
1617
<packaging>jar</packaging>
1718

1819
<dependencies>
19-
{generated_bzl_deps}
20+
{generated_bzl_deps}
2021
</dependencies>
2122
</project>

‎java/pom.xml

-72
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
<java.version>1.8</java.version>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<projetct.version>0.1-SNAPSHOT</projetct.version>
23-
<slf4j.version>1.7.25</slf4j.version>
24-
<jaxb.version>2.3.0</jaxb.version>
2523
</properties>
2624

2725
<dependencyManagement>
@@ -31,76 +29,6 @@
3129
<artifactId>arrow-plasma</artifactId>
3230
<version>0.13.0-SNAPSHOT</version>
3331
</dependency>
34-
<dependency>
35-
<groupId>de.ruedigermoeller</groupId>
36-
<artifactId>fst</artifactId>
37-
<version>2.47</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.ow2.asm</groupId>
41-
<artifactId>asm</artifactId>
42-
<version>6.0</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>com.github.davidmoten</groupId>
46-
<artifactId>flatbuffers-java</artifactId>
47-
<version>1.9.0.1</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.beust</groupId>
51-
<artifactId>jcommander</artifactId>
52-
<version>1.72</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>redis.clients</groupId>
56-
<artifactId>jedis</artifactId>
57-
<version>2.8.0</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>commons-io</groupId>
61-
<artifactId>commons-io</artifactId>
62-
<version>2.5</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.apache.commons</groupId>
66-
<artifactId>commons-lang3</artifactId>
67-
<version>3.4</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>com.google.guava</groupId>
71-
<artifactId>guava</artifactId>
72-
<version>19.0</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.slf4j</groupId>
76-
<artifactId>slf4j-log4j12</artifactId>
77-
<version>${slf4j.version}</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>com.typesafe</groupId>
81-
<artifactId>config</artifactId>
82-
<version>1.3.2</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.testng</groupId>
86-
<artifactId>testng</artifactId>
87-
<version>6.9.9</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>javax.xml.bind</groupId>
91-
<artifactId>jaxb-api</artifactId>
92-
<version>${jaxb.version}</version>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.sun.xml.bind</groupId>
96-
<artifactId>jaxb-core</artifactId>
97-
<version>${jaxb.version}</version>
98-
</dependency>
99-
<dependency>
100-
<groupId>com.sun.xml.bind</groupId>
101-
<artifactId>jaxb-impl</artifactId>
102-
<version>${jaxb.version}</version>
103-
</dependency>
10432
</dependencies>
10533
</dependencyManagement>
10634

‎java/runtime/pom.xml

+51-43
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- This file is auto-generated by Bazel from pom_template.xml, do not modify it. -->
23
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xmlns="http://maven.apache.org/POM/4.0.0"
45
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -21,53 +22,60 @@
2122
<artifactId>ray-api</artifactId>
2223
<version>${project.version}</version>
2324
</dependency>
24-
<dependency>
25-
<groupId>com.typesafe</groupId>
26-
<artifactId>config</artifactId>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.apache.commons</groupId>
30-
<artifactId>commons-lang3</artifactId>
31-
</dependency>
32-
<dependency>
33-
<groupId>de.ruedigermoeller</groupId>
34-
<artifactId>fst</artifactId>
35-
</dependency>
36-
<dependency>
37-
<groupId>com.github.davidmoten</groupId>
38-
<artifactId>flatbuffers-java</artifactId>
39-
</dependency>
40-
<dependency>
41-
<groupId>redis.clients</groupId>
42-
<artifactId>jedis</artifactId>
43-
</dependency>
4425
<dependency>
4526
<groupId>org.apache.arrow</groupId>
4627
<artifactId>arrow-plasma</artifactId>
4728
</dependency>
48-
<dependency>
49-
<groupId>commons-io</groupId>
50-
<artifactId>commons-io</artifactId>
51-
</dependency>
52-
<dependency>
53-
<groupId>com.google.guava</groupId>
54-
<artifactId>guava</artifactId>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.slf4j</groupId>
58-
<artifactId>slf4j-log4j12</artifactId>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.ow2.asm</groupId>
62-
<artifactId>asm</artifactId>
63-
</dependency>
64-
65-
<!-- test dependencies -->
66-
<dependency>
67-
<groupId>org.testng</groupId>
68-
<artifactId>testng</artifactId>
69-
<scope>test</scope>
70-
</dependency>
29+
<dependency>
30+
<groupId>com.github.davidmoten</groupId>
31+
<artifactId>flatbuffers-java</artifactId>
32+
<version>1.9.0.1</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>com.google.guava</groupId>
36+
<artifactId>guava</artifactId>
37+
<version>27.0.1-jre</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.typesafe</groupId>
41+
<artifactId>config</artifactId>
42+
<version>1.3.2</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>commons-io</groupId>
46+
<artifactId>commons-io</artifactId>
47+
<version>2.5</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>de.ruedigermoeller</groupId>
51+
<artifactId>fst</artifactId>
52+
<version>2.47</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.apache.commons</groupId>
56+
<artifactId>commons-lang3</artifactId>
57+
<version>3.4</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.ow2.asm</groupId>
61+
<artifactId>asm</artifactId>
62+
<version>6.0</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.slf4j</groupId>
66+
<artifactId>slf4j-api</artifactId>
67+
<version>1.7.25</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.slf4j</groupId>
71+
<artifactId>slf4j-log4j12</artifactId>
72+
<version>1.7.25</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>redis.clients</groupId>
76+
<artifactId>jedis</artifactId>
77+
<version>2.8.0</version>
78+
</dependency>
7179
</dependencies>
7280

7381
<build>

‎java/runtime/pom_template.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
{auto_gen_header}
23
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xmlns="http://maven.apache.org/POM/4.0.0"
45
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -25,7 +26,7 @@
2526
<groupId>org.apache.arrow</groupId>
2627
<artifactId>arrow-plasma</artifactId>
2728
</dependency>
28-
{generated_bzl_deps}
29+
{generated_bzl_deps}
2930
</dependencies>
3031

3132
<build>

0 commit comments

Comments
 (0)