Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Xavier Léauté 2021-03-12 20:18:13 -08:00 committed by GitHub
parent ed91a2bb38
commit 68781a0d20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integration-tests/src/main/java/org/testng/DruidTestRunnerFactory.java
View File

@ -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

2
integration-tests/src/test/resources/testng.xml
View File

@ -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">

21
pom.xml
View File

@ -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>