Update junit to 5.4.0 release version (#3441)
authorXin Wang <xin.victorwang@gmail.com>
Fri, 8 Feb 2019 18:17:58 +0000 (02:17 +0800)
committerGitHub <noreply@github.com>
Fri, 8 Feb 2019 18:17:58 +0000 (02:17 +0800)
* update junit to 5.4.0 release version
* remove uesles config

dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
dubbo-config/dubbo-config-spring/pom.xml
dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/support/FileNetworkerTest.java
pom.xml

index 9e32f93..3b5743d 100644 (file)
@@ -21,8 +21,7 @@ package org.apache.dubbo.common.utils;
 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 java.nio.file.Path;
 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 class IOUtilsTest {
     }
 
     @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 class IOUtilsTest {
     }
 
     @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);
index f0d1a80..6f30581 100644 (file)
@@ -34,9 +34,7 @@ import org.junit.jupiter.api.AfterEach;
 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.Collections;
 import java.util.List;
 import java.util.Properties;
 
-@ExtendWith(TempDirectory.class)
 public class AbstractInterfaceConfigTest {
     private static File dubboProperties;
 
index 08cc297..988715b 100644 (file)
             <scope>test</scope>\r
         </dependency>\r
     </dependencies>\r
-    <build>\r
-        <plugins>\r
-            <!-- upload xsd file command line\r
-            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\r
-            -->\r
-            <!--\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>wagon-maven-plugin</artifactId>\r
-                <version>1.0-beta-3</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>upload-schema</id>\r
-                        <phase>deploy</phase>\r
-                        <goals>\r
-                            <goal>upload-single</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <fromFile>${basedir}/src/main/resources/META-INF/dubbo.xsd</fromFile>\r
-                            <url>dav:http://code.alibabatech.com/schema/dubbo/</url>\r
-                            <serverId>opensesame.releases.account</serverId>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-            -->\r
-        </plugins>\r
-    </build>\r
 </project>\r
index 37818c7..a442173 100644 (file)
@@ -27,9 +27,7 @@ import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter;
 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 java.util.concurrent.TimeUnit;
 
 import static org.mockito.Mockito.mock;
 
-@ExtendWith(TempDirectory.class)
 public class FileNetworkerTest {
 
     @BeforeEach
diff --git a/pom.xml b/pom.xml
index cbf2687..6f96ac5 100644 (file)
--- 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>