Fix pom file generation (#4800)

This commit is contained in:
Hao Chen
2019-05-17 10:56:39 +08:00
committed by GitHub
parent 9f2645d6ea
commit ffd596d5bb
4 changed files with 28 additions and 6 deletions
+7 -5
View File
@@ -25,8 +25,10 @@ def flatbuffer_java_library(name, srcs, outs, out_prefix, includes = [], include
)
def define_java_module(name, additional_srcs = [], additional_resources = [], define_test_lib = False, test_deps = [], **kwargs):
lib_name = "org_ray_ray_" + name
pom_file_targets = [lib_name]
native.java_library(
name = "org_ray_ray_" + name,
name = lib_name,
srcs = additional_srcs + native.glob([name + "/src/main/java/**/*.java"]),
resources = native.glob([name + "/src/main/resources/**"]) + additional_resources,
**kwargs
@@ -40,8 +42,10 @@ def define_java_module(name, additional_srcs = [], additional_resources = [], de
tags = ["checkstyle"],
)
if define_test_lib:
test_lib_name = "org_ray_ray_" + name + "_test"
pom_file_targets.append(test_lib_name)
native.java_library(
name = "org_ray_ray_" + name + "_test",
name = test_lib_name,
srcs = native.glob([name + "/src/test/java/**/*.java"]),
deps = test_deps,
)
@@ -55,9 +59,7 @@ def define_java_module(name, additional_srcs = [], additional_resources = [], de
)
pom_file(
name = "org_ray_ray_" + name + "_pom",
targets = [
":org_ray_ray_" + name,
],
targets = pom_file_targets,
template_file = name + "/pom_template.xml",
substitutions = {
"{auto_gen_header}": "<!-- This file is auto-generated by Bazel from pom_template.xml, do not modify it. -->",
+10
View File
@@ -26,6 +26,11 @@
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-plasma</artifactId>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.72</version>
</dependency>
<dependency>
<groupId>com.github.davidmoten</groupId>
<artifactId>flatbuffers-java</artifactId>
@@ -71,6 +76,11 @@
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.9</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
+10
View File
@@ -27,6 +27,11 @@
<artifactId>ray-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.72</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -41,6 +46,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.9</version>
</dependency>
</dependencies>
</project>
+1 -1
View File
@@ -38,5 +38,5 @@ popd
pushd $ROOT_DIR
echo "Testing maven install."
mvn clean install -Dmaven.test.skip
mvn clean install -DskipTests
popd