summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamas Penzes <tamaas@cloudera.com>2020-06-16 11:28:10 +0200
committerEnrico Olivelli <eolivelli@apache.org>2020-06-16 11:28:10 +0200
commit8da9c723ac1a889c989ecefada722ed858049537 (patch)
tree050965207bd0d2cec6712ad9ce18d1a10ca10fac
parent8c9590caeaaa9079d958eb79da77321586c76236 (diff)
downloadzookeeper-8da9c723ac1a889c989ecefada722ed858049537.tar.gz
ZOOKEEPER-3850: Update jUnit to 5.6 in pom.xml files
First sub-task of ZOOKEEPER-3732 Update jUnit to 5.6. Updating jUnit to 5.6.2 without code changes. Since many jUnit resources got deprecated I had to switch off the check for deprecation which has to be enabled again in a later step. Change-Id: Ib152ab085c3f3ed8fec7f317d33a68f43d14735f Author: Tamas Penzes <tamaas@cloudera.com> Reviewers: Enrico Olivelli <eolivelli@apache.org>, Mate Szalay-Beko <symat@apache.org> Closes #1372 from tamaashu/ZOOKEEPER-3850
-rwxr-xr-xpom.xml12
-rw-r--r--zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml4
-rwxr-xr-xzookeeper-contrib/zookeeper-contrib-rest/pom.xml4
-rwxr-xr-xzookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml4
-rwxr-xr-xzookeeper-it/pom.xml4
-rwxr-xr-xzookeeper-jute/pom.xml4
-rwxr-xr-xzookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml4
-rwxr-xr-xzookeeper-recipes/pom.xml4
-rwxr-xr-xzookeeper-server/pom.xml4
9 files changed, 24 insertions, 20 deletions
diff --git a/pom.xml b/pom.xml
index 055d474a5..722efb82b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -429,7 +429,7 @@
<slf4j.version>1.7.25</slf4j.version>
<audience-annotations.version>0.5.0</audience-annotations.version>
<jmockit.version>1.48</jmockit.version>
- <junit.version>4.12</junit.version>
+ <junit.version>5.6.2</junit.version>
<log4j.version>1.2.17</log4j.version>
<mockito.version>2.27.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
@@ -555,8 +555,13 @@
<version>${jmockit.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
</dependency>
<dependency>
@@ -642,7 +647,6 @@
<showWarnings>true</showWarnings>
<compilerArgs>
<compilerArg>-Werror</compilerArg>
- <compilerArg>-Xlint:deprecation</compilerArg>
<compilerArg>-Xlint:unchecked</compilerArg>
<compilerArg>-Xlint:-options</compilerArg>
<compilerArg>-Xdoclint:-missing</compilerArg>
diff --git a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
index e95b2bcb7..074a45547 100644
--- a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
+++ b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml
@@ -71,8 +71,8 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
index 99e4f9f61..c75f012f5 100755
--- a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
@@ -115,8 +115,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index 6d474608c..c9f3b1e2c 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -70,8 +70,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/zookeeper-it/pom.xml b/zookeeper-it/pom.xml
index 10f8b9d14..2c381a625 100755
--- a/zookeeper-it/pom.xml
+++ b/zookeeper-it/pom.xml
@@ -54,8 +54,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml
index 129ba12ce..770282e80 100755
--- a/zookeeper-jute/pom.xml
+++ b/zookeeper-jute/pom.xml
@@ -37,8 +37,8 @@
<artifactId>audience-annotations</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
index 68e7eb62c..4f70e9864 100755
--- a/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
+++ b/zookeeper-metrics-providers/zookeeper-prometheus-metrics/pom.xml
@@ -75,8 +75,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index 051f64522..39a898ccd 100755
--- a/zookeeper-recipes/pom.xml
+++ b/zookeeper-recipes/pom.xml
@@ -80,8 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 90f615158..fade079d3 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -152,8 +152,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>