Skip to content

Commit 0b386e4

Browse files
tamaashuanmolnar
tamaashu
authored and
anmolnar
committed
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 <tamaas@cloudera.com> Reviewers: eolivelli@apache.org, andor@apache.org Closes #1424 from tamaashu/ZOOKEEPER-3862
1 parent b86899e commit 0b386e4

5 files changed

Lines changed: 7 additions & 11 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,7 @@
665665
<showWarnings>true</showWarnings>
666666
<compilerArgs>
667667
<compilerArg>-Werror</compilerArg>
668+
<compilerArg>-Xlint:deprecation</compilerArg>
668669
<compilerArg>-Xlint:unchecked</compilerArg>
669670
<compilerArg>-Xlint:-options</compilerArg>
670671
<compilerArg>-Xdoclint:-missing</compilerArg>

‎zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
</dependency>
7272

7373
<dependency>
74-
<groupId>org.junit.vintage</groupId>
75-
<artifactId>junit-vintage-engine</artifactId>
74+
<groupId>org.junit.jupiter</groupId>
75+
<artifactId>junit-jupiter-engine</artifactId>
7676
<scope>test</scope>
7777
</dependency>
7878
</dependencies>

‎zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
package org.apache.zookeeper.compatibility;
2020

21-
import static org.junit.Assert.assertEquals;
22-
import static org.junit.Assert.assertNotNull;
21+
import static org.junit.jupiter.api.Assertions.assertEquals;
22+
import static org.junit.jupiter.api.Assertions.assertNotNull;
2323
import java.util.concurrent.BlockingQueue;
2424
import java.util.concurrent.LinkedBlockingQueue;
2525
import java.util.concurrent.TimeUnit;
@@ -28,7 +28,7 @@
2828
import org.apache.curator.framework.recipes.cache.CuratorCache;
2929
import org.apache.curator.retry.RetryOneTime;
3030
import org.apache.curator.test.TestingServer;
31-
import org.junit.Test;
31+
import org.junit.jupiter.api.Test;
3232

3333
/**
3434
* Make sure minimal Apache Curator APIs work correctly. As it's a widely used ZooKeeper
@@ -67,7 +67,7 @@ public void testBasicUsageOfApisAndRecipes() throws Exception {
6767
private static String poll(BlockingQueue<String> queue) {
6868
try {
6969
String value = queue.poll(TIMEOUT_MS, TimeUnit.MILLISECONDS);
70-
assertNotNull("Event poll timed out", value);
70+
assertNotNull(value, "Event poll timed out");
7171
return value;
7272
} catch (InterruptedException e) {
7373
Thread.currentThread().interrupt();

zookeeper-server/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java renamed to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java

File renamed without changes.

‎zookeeper-server/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,6 @@
151151
<artifactId>jmockit</artifactId>
152152
<scope>test</scope>
153153
</dependency>
154-
<dependency>
155-
<groupId>org.junit.vintage</groupId>
156-
<artifactId>junit-vintage-engine</artifactId>
157-
<scope>test</scope>
158-
</dependency>
159154
<dependency>
160155
<groupId>org.junit.jupiter</groupId>
161156
<artifactId>junit-jupiter-api</artifactId>

0 commit comments

Comments
 (0)