From bccac78e9f1473469e97bebccd516fafaab7e8a1 Mon Sep 17 00:00:00 2001
From: Xin Wang <xin.victorwang@gmail.com>
Date: Sat, 9 Feb 2019 02:17:58 +0800
Subject: [PATCH] Update junit to 5.4.0 release version (#3441)

* update junit to 5.4.0 release version
* remove uesles config
---
 .../dubbo/common/utils/IOUtilsTest.java       |  8 ++----
 .../config/AbstractInterfaceConfigTest.java   |  5 +---
 dubbo-config/dubbo-config-spring/pom.xml      | 28 -------------------
 .../p2p/support/FileNetworkerTest.java        |  5 +---
 pom.xml                                       |  4 +--
 5 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
index 9e32f939cb6..3b5743d2b40 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
@@ -21,8 +21,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.support.io.TempDirectory;
+import org.junit.jupiter.api.io.TempDir;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,7 +37,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
-@ExtendWith(TempDirectory.class)
 public class IOUtilsTest {
 
     private static String TEXT = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890";
@@ -89,7 +87,7 @@ public void testWrite5() throws Exception {
     }
 
     @Test
-    public void testLines(@TempDirectory.TempDir Path tmpDir) throws Exception {
+    public void testLines(@TempDir Path tmpDir) throws Exception {
         File file = tmpDir.getFileName().toAbsolutePath().toFile();
         IOUtils.writeLines(file, new String[]{TEXT});
         String[] lines = IOUtils.readLines(file);
@@ -118,7 +116,7 @@ public void testRead() throws Exception {
     }
 
     @Test
-    public void testAppendLines(@TempDirectory.TempDir Path tmpDir) throws Exception {
+    public void testAppendLines(@TempDir Path tmpDir) throws Exception {
         File file = tmpDir.getFileName().toAbsolutePath().toFile();
         IOUtils.appendLines(file, new String[]{"a", "b", "c"});
         String[] lines = IOUtils.readLines(file);
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
index f0d1a80a262..6f30581b875 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
@@ -34,9 +34,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.support.io.TempDirectory;
-import org.junit.jupiter.api.support.io.TempDirectory.TempDir;
+import org.junit.jupiter.api.io.TempDir;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -48,7 +46,6 @@
 import java.util.List;
 import java.util.Properties;
 
-@ExtendWith(TempDirectory.class)
 public class AbstractInterfaceConfigTest {
     private static File dubboProperties;
 
diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
index 08cc297f02f..988715baf4f 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -129,32 +129,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <!-- upload xsd file command line
-            mvn org.codehaus.mojo:wagon-maven-plugin:1.0-beta-3:upload-single -Dwagon.fromFile=src/main/resources/META-INF/dubbo.xsd -Dwagon.url=dav:http://code.alibabatech.com/schema/dubbo/ -Dwagon.serverId=opensesame.releases.account
-            -->
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>wagon-maven-plugin</artifactId>
-                <version>1.0-beta-3</version>
-                <executions>
-                    <execution>
-                        <id>upload-schema</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>upload-single</goal>
-                        </goals>
-                        <configuration>
-                            <fromFile>${basedir}/src/main/resources/META-INF/dubbo.xsd</fromFile>
-                            <url>dav:http://code.alibabatech.com/schema/dubbo/</url>
-                            <serverId>opensesame.releases.account</serverId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-        </plugins>
-    </build>
 </project>
diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java b/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
index 37818c7d342..a442173c45c 100644
--- a/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
+++ b/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
@@ -27,9 +27,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.support.io.TempDirectory;
-import org.junit.jupiter.api.support.io.TempDirectory.TempDir;
+import org.junit.jupiter.api.io.TempDir;
 
 import java.nio.file.Path;
 import java.util.concurrent.CountDownLatch;
@@ -37,7 +35,6 @@
 
 import static org.mockito.Mockito.mock;
 
-@ExtendWith(TempDirectory.class)
 public class FileNetworkerTest {
 
     @BeforeEach
diff --git a/pom.xml b/pom.xml
index cbf26870583..6f96ac5b69d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,8 +89,8 @@
 
     <properties>
         <!-- Test libs -->
-        <junit_jupiter_version>5.4.0-M1</junit_jupiter_version>
-        <hazelcast_version>3.9-EA</hazelcast_version>
+        <junit_jupiter_version>5.4.0</junit_jupiter_version>
+        <hazelcast_version>3.11.1</hazelcast_version>
         <hamcrest_version>1.3</hamcrest_version>
         <hibernate_validator_version>5.2.4.Final</hibernate_validator_version>
         <el_api_version>2.2.4</el_api_version>