Repository: hadoop
Updated Branches:
  refs/heads/trunk 0ca50648c -> 1c0aae63a


HADOOP-14775. Change junit dependency in parent pom file to junit 5 while 
maintaining backward compatibility to junit4. Contributed by Akira Ajisaka.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1c0aae63
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1c0aae63
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1c0aae63

Branch: refs/heads/trunk
Commit: 1c0aae63a7eb59e6f1857b4438ba89dec7821c19
Parents: 0ca5064
Author: Takanobu Asanuma <[email protected]>
Authored: Wed Oct 24 16:48:06 2018 +0900
Committer: Takanobu Asanuma <[email protected]>
Committed: Wed Oct 24 16:48:06 2018 +0900

----------------------------------------------------------------------
 hadoop-project/pom.xml | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c0aae63/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index d5aee4b..ce3cabe 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -129,7 +129,7 @@
 
     <!-- Plugin versions and config -->
     <maven-surefire-plugin.argLine>-Xmx2048m 
-XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>
-    <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
     
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
     
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
 
@@ -158,6 +158,10 @@
     <snakeyaml.version>1.16</snakeyaml.version>
     <hbase.one.version>1.2.6</hbase.one.version>
     <hbase.two.version>2.0.0-beta-1</hbase.two.version>
+    <junit.version>4.12</junit.version>
+    <junit.jupiter.version>5.3.1</junit.jupiter.version>
+    <junit.vintage.version>5.3.1</junit.vintage.version>
+    <junit.platform.version>1.3.1</junit.platform.version>
   </properties>
 
   <dependencyManagement>
@@ -1069,9 +1073,35 @@
         <version>1.0.0-M2</version>
       </dependency>
       <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>${junit.jupiter.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.11</version>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit.jupiter.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+        <version>${junit.vintage.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <!-- Only required to run tests in an IDE that bundles an older version 
-->
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-launcher</artifactId>
+        <version>${junit.platform.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.github.stefanbirkner</groupId>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to