This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 0b386e4 ZOOKEEPER-3862: Re-enable deprecation check after finishing
jUnit upg…
0b386e4 is described below
commit 0b386e4579645761e341510b185899d060e51c82
Author: Tamas Penzes <[email protected]>
AuthorDate: Wed Aug 12 11:46:50 2020 +0200
ZOOKEEPER-3862: Re-enable deprecation check after finishing jUnit upg…
…rade
Last changes on sub-components which need to be build every time and
re-enable deprecation check for the builds.
Change-Id: Iebf83d7727d9d7535b367613d262800ad6331fa7
Author: Tamas Penzes <[email protected]>
Reviewers: [email protected], [email protected]
Closes #1424 from tamaashu/ZOOKEEPER-3862
---
pom.xml | 1 +
.../zookeeper-compatibility-tests-curator/pom.xml | 4 ++--
.../zookeeper/compatibility/TestApacheCuratorCompatibility.java | 8 ++++----
.../src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java | 0
zookeeper-server/pom.xml | 5 -----
5 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6edfe40..26c32d1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -665,6 +665,7 @@
<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 074a455..e254630 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>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java
b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java
index b60a004..d793d6e 100644
---
a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java
+++
b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java
@@ -18,8 +18,8 @@
package org.apache.zookeeper.compatibility;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -28,7 +28,7 @@ import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.recipes.cache.CuratorCache;
import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.test.TestingServer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Make sure minimal Apache Curator APIs work correctly. As it's a widely used
ZooKeeper
@@ -67,7 +67,7 @@ public class TestApacheCuratorCompatibility {
private static String poll(BlockingQueue<String> queue) {
try {
String value = queue.poll(TIMEOUT_MS, TimeUnit.MILLISECONDS);
- assertNotNull("Event poll timed out", value);
+ assertNotNull(value, "Event poll timed out");
return value;
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java
b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java
similarity index 100%
rename from
zookeeper-server/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java
rename to
zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 7440dde..059f2ff 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -152,11 +152,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
