You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by xv...@apache.org on 2021/03/13 04:18:41 UTC
[druid] branch master updated: update testing frameworks for Java
15 support (#10984)
This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 68781a0 update testing frameworks for Java 15 support (#10984)
68781a0 is described below
commit 68781a0d20aeae0ea8a53f66b115b745615209ea
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Fri Mar 12 20:18:13 2021 -0800
update testing frameworks for Java 15 support (#10984)
* update jacoco to 0.8.6
* update easymock to 4.2
* update equalsverifier to 3.5.5
* update mockito to 3.8.0
* update powermock to 2.0.9
* update assertj-core to 3.19.0
* update testng to 7.3.0
- fix DTD url security for testng 7.x
- fix backwards incompatibility in testng 7.x
---
.../java/org/testng/DruidTestRunnerFactory.java | 3 +--
integration-tests/src/test/resources/testng.xml | 2 +-
pom.xml | 21 ++++++++++++++-------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java b/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java
index daafff4..dee52bd 100644
--- a/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java
+++ b/integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java
@@ -27,7 +27,6 @@ import org.testng.internal.annotations.IAnnotationFinder;
import org.testng.xml.XmlTest;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
/**
@@ -73,7 +72,7 @@ public class DruidTestRunnerFactory implements ITestRunnerFactory
List<IClassListener> classListeners
)
{
- super(configuration, suite, test, outputDirectory, finder, skipFailedInvocationCounts, methodListeners, classListeners, Systematiser.getComparator(), Collections.emptyMap());
+ super(configuration, suite, test, outputDirectory, finder, skipFailedInvocationCounts, methodListeners, classListeners, Systematiser.getComparator(), new DataProviderHolder());
}
@Override
diff --git a/integration-tests/src/test/resources/testng.xml b/integration-tests/src/test/resources/testng.xml
index b27549b..c7d88e1 100644
--- a/integration-tests/src/test/resources/testng.xml
+++ b/integration-tests/src/test/resources/testng.xml
@@ -17,7 +17,7 @@
~ under the License.
-->
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
<suite name="IntegrationTestSuite" data-provider-thread-count="2">
diff --git a/pom.xml b/pom.xml
index cc2321d..69754c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,11 +108,11 @@
<slf4j.version>1.7.12</slf4j.version>
<!-- If compiling with different hadoop version also modify default hadoop coordinates in TaskConfig.java -->
<hadoop.compile.version>2.8.5</hadoop.compile.version>
- <mockito.version>3.2.4</mockito.version>
- <powermock.version>2.0.2</powermock.version>
+ <mockito.version>3.8.0</mockito.version>
+ <powermock.version>2.0.9</powermock.version>
<aws.sdk.version>1.11.884</aws.sdk.version>
<caffeine.version>2.8.0</caffeine.version>
- <jacoco.version>0.8.5</jacoco.version>
+ <jacoco.version>0.8.6</jacoco.version>
<!-- Curator requires 3.4.x ZooKeeper clients to maintain compatibility with 3.4.x ZooKeeper servers,
If we upgrade to 3.5.x clients, curator requires 3.5.x servers, which would break backwards compatibility
see http://curator.apache.org/zk-compatibility.html -->
@@ -1048,7 +1048,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>4.0.2</version>
+ <version>4.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1113,7 +1113,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.13.2</version>
+ <version>3.19.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1231,7 +1231,14 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.14.3</version>
+ <version>7.3.0</version>
+ <!-- testng ships guice 4.2, which requires a newer version of guava -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -1260,7 +1267,7 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>3.1.11</version>
+ <version>3.5.5</version>
<scope>test</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org