From 0c254878db0cc59388e94df803b9232c94b6487e Mon Sep 17 00:00:00 2001 From: Kai Yang Date: Wed, 30 Sep 2020 14:38:52 +0800 Subject: [PATCH] [Java] Upgrade TestNG to 7.3.0 (#11135) --- java/BUILD.bazel | 1 - java/dependencies.bzl | 3 +-- java/runtime/pom.xml | 7 +------ java/test/pom.xml | 2 +- java/testng.xml | 2 +- streaming/java/BUILD.bazel | 1 - streaming/java/dependencies.bzl | 5 ++--- streaming/java/pom.xml | 2 +- streaming/java/streaming-api/pom.xml | 2 +- streaming/java/streaming-runtime/pom.xml | 2 +- streaming/java/streaming-state/pom.xml | 5 ----- streaming/java/testng.xml | 2 +- 12 files changed, 10 insertions(+), 24 deletions(-) diff --git a/java/BUILD.bazel b/java/BUILD.bazel index 5f852af9c..a0845f2e9 100644 --- a/java/BUILD.bazel +++ b/java/BUILD.bazel @@ -63,7 +63,6 @@ define_java_module( ":io_ray_ray_api", ":io_ray_ray_runtime", "@maven//:org_apache_commons_commons_lang3", - "@maven//:com_beust_jcommander", "@maven//:org_testng_testng", "@maven//:commons_io_commons_io", "@maven//:javax_xml_bind_jaxb_api", diff --git a/java/dependencies.bzl b/java/dependencies.bzl index 516de4b00..242136fa4 100644 --- a/java/dependencies.bzl +++ b/java/dependencies.bzl @@ -3,7 +3,6 @@ load("@rules_jvm_external//:defs.bzl", "maven_install") def gen_java_deps(): maven_install( artifacts = [ - "com.beust:jcommander:1.72", "com.google.code.gson:gson:2.8.5", "com.google.guava:guava:27.0.1-jre", "com.google.protobuf:protobuf-java:3.8.0", @@ -18,7 +17,7 @@ def gen_java_deps(): "org.msgpack:msgpack-core:0.8.20", "org.ow2.asm:asm:6.0", "org.slf4j:slf4j-log4j12:1.7.25", - "org.testng:testng:7.1.0", + "org.testng:testng:7.3.0", "redis.clients:jedis:2.8.0", "net.java.dev.jna:jna:5.5.0", ], diff --git a/java/runtime/pom.xml b/java/runtime/pom.xml index 5fbb8b65d..a71b6c682 100644 --- a/java/runtime/pom.xml +++ b/java/runtime/pom.xml @@ -39,11 +39,6 @@ ray-api ${project.version} - - com.beust - jcommander - 1.72 - com.google.guava guava @@ -112,7 +107,7 @@ org.testng testng - 7.1.0 + 7.3.0 redis.clients diff --git a/java/test/pom.xml b/java/test/pom.xml index 6af5844e9..f401f3cff 100644 --- a/java/test/pom.xml +++ b/java/test/pom.xml @@ -79,7 +79,7 @@ org.testng testng - 7.1.0 + 7.3.0 diff --git a/java/testng.xml b/java/testng.xml index aae887f2a..6cc10b9ab 100644 --- a/java/testng.xml +++ b/java/testng.xml @@ -1,5 +1,5 @@ - + diff --git a/streaming/java/BUILD.bazel b/streaming/java/BUILD.bazel index 522570020..6200f6482 100644 --- a/streaming/java/BUILD.bazel +++ b/streaming/java/BUILD.bazel @@ -153,7 +153,6 @@ java_binary( ":io_ray_ray_streaming-runtime_test", ":io_ray_ray_streaming-state", "//java:io_ray_ray_runtime", - "@ray_streaming_maven//:com_beust_jcommander", "@ray_streaming_maven//:org_mockito_mockito_all", "@ray_streaming_maven//:org_powermock_powermock_api_mockito", "@ray_streaming_maven//:org_powermock_powermock_module_testng", diff --git a/streaming/java/dependencies.bzl b/streaming/java/dependencies.bzl index b834f6a39..37d0cc8de 100644 --- a/streaming/java/dependencies.bzl +++ b/streaming/java/dependencies.bzl @@ -4,7 +4,6 @@ def gen_streaming_java_deps(): maven_install( name = "ray_streaming_maven", artifacts = [ - "com.beust:jcommander:1.72", "com.google.guava:guava:27.0.1-jre", "com.google.code.findbugs:jsr305:3.0.2", "com.google.code.gson:gson:2.8.5", @@ -16,12 +15,12 @@ def gen_streaming_java_deps(): "org.slf4j:slf4j-api:1.7.12", "org.slf4j:slf4j-log4j12:1.7.25", "org.apache.logging.log4j:log4j-core:2.8.2", - "org.testng:testng:7.1.0", + "org.testng:testng:7.3.0", "log4j:log4j:1.2.17", "org.mockito:mockito-all:1.10.19", "org.apache.commons:commons-lang3:3.3.2", "org.msgpack:msgpack-core:0.8.20", - "org.testng:testng:7.1.0", + "org.testng:testng:7.3.0", "org.mockito:mockito-all:1.10.19", "org.powermock:powermock-module-testng:1.6.6", "org.powermock:powermock-api-mockito:1.6.6", diff --git a/streaming/java/pom.xml b/streaming/java/pom.xml index c6ce466a8..103f7dc3d 100644 --- a/streaming/java/pom.xml +++ b/streaming/java/pom.xml @@ -66,7 +66,7 @@ 1.1.0-SNAPSHOT 1.7.25 1.2.17 - 7.1.0 + 7.3.0 1.10.19 27.0.1-jre 2.57 diff --git a/streaming/java/streaming-api/pom.xml b/streaming/java/streaming-api/pom.xml index 3333a3afd..61e3ae006 100644 --- a/streaming/java/streaming-api/pom.xml +++ b/streaming/java/streaming-api/pom.xml @@ -65,7 +65,7 @@ org.testng testng - 7.1.0 + 7.3.0 diff --git a/streaming/java/streaming-runtime/pom.xml b/streaming/java/streaming-runtime/pom.xml index 4b6540392..7331bc103 100644 --- a/streaming/java/streaming-runtime/pom.xml +++ b/streaming/java/streaming-runtime/pom.xml @@ -127,7 +127,7 @@ org.testng testng - 7.1.0 + 7.3.0 diff --git a/streaming/java/streaming-state/pom.xml b/streaming/java/streaming-state/pom.xml index 4e8109bc9..3c051096d 100644 --- a/streaming/java/streaming-state/pom.xml +++ b/streaming/java/streaming-state/pom.xml @@ -86,11 +86,6 @@ commons-lang3 3.3.2 - - com.beust - jcommander - 1.27 - \ No newline at end of file diff --git a/streaming/java/testng.xml b/streaming/java/testng.xml index 62c72a40f..3eaadbbdc 100644 --- a/streaming/java/testng.xml +++ b/streaming/java/testng.xml @@ -1,5 +1,5 @@ - +