You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2021/03/25 11:29:56 UTC

[hadoop] branch branch-3.1 updated: HADOOP-17602. Upgrade JUnit to 4.13.1. Contributed by Ahmed Hussein.

This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new a8ddc17  HADOOP-17602. Upgrade JUnit to 4.13.1. Contributed by Ahmed Hussein.
a8ddc17 is described below

commit a8ddc179df55f6723604f42dc47b321c6bb4d464
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Thu Mar 25 19:53:30 2021 +0900

    HADOOP-17602. Upgrade JUnit to 4.13.1. Contributed by Ahmed Hussein.
    
    (cherry picked from commit c5929c00a35a8e58bcf1c80d9d414c3cbdce4483)
    
     Conflicts:
    	hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml
    
    (cherry picked from commit 80d46360671f2d52bbe5ff3683b661f6f8adfe7d)
    
     Conflicts:
    	hadoop-project/pom.xml
    
    (cherry picked from commit 819239f9718bd898ef05a6558eb4ed9451798876)
---
 hadoop-project/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index b29dc5c..ee71a27 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -150,6 +150,7 @@
     <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.13.1</junit.version>
     <woodstox.version>5.3.0</woodstox.version>
   </properties>
 
@@ -892,7 +893,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.11</version>
+        <version>${junit.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>

---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org