[iceberg] branch master updated: Build: Upgrade to JUnit 5 (#2797)

[blue]

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

blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/master by this push:
     new bed47a4  Build: Upgrade to JUnit 5 (#2797)
bed47a4 is described below

commit bed47a40ec444e9a97c178bba0a72d9dbc864042
Author: Eduard Tudenhöfner <etudenhoef...@gmail.com>
AuthorDate: Sun Jul 11 01:15:27 2021 +0200

    Build: Upgrade to JUnit 5 (#2797)
---
 build.gradle   | 12 +++++++++---
 versions.props |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 92c339b..446d6ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,7 +126,8 @@ subprojects {
     compile 'org.slf4j:slf4j-api'
     compile 'com.github.stephenc.findbugs:findbugs-annotations'
 
-    testCompile 'junit:junit'
+    testCompile 'org.junit.vintage:junit-vintage-engine'
+    testCompile 'org.junit.jupiter:junit-jupiter'
     testCompile 'org.slf4j:slf4j-simple'
     testCompile 'org.mockito:mockito-core'
     testCompile 'org.assertj:assertj-core'
@@ -285,6 +286,7 @@ project(':iceberg-aws') {
     testCompile("com.adobe.testing:s3mock-junit4") {
       exclude module: "spring-boot-starter-logging"
       exclude module: "logback-classic"
+      exclude group: 'junit'
     }
   }
 
@@ -332,9 +334,12 @@ project(':iceberg-flink') {
     testCompile "org.apache.flink:flink-core"
     testCompile "org.apache.flink:flink-runtime_2.12"
     testCompile "org.apache.flink:flink-table-planner-blink_2.12"
-    testCompile "org.apache.flink:flink-test-utils-junit"
+    testCompile ("org.apache.flink:flink-test-utils-junit") {
+      exclude group: 'junit'
+    }
     testCompile("org.apache.flink:flink-test-utils_2.12") {
       exclude group: "org.apache.curator", module: 'curator-test'
+      exclude group: 'junit'
     }
 
     testCompile project(path: ':iceberg-hive-metastore', configuration: 
'testArtifacts')
@@ -1026,6 +1031,7 @@ project(':iceberg-spark3') {
     
spark31Implementation("org.apache.spark:spark-hive_2.12:${project.ext.Spark31Version}")
 {
       exclude group: 'org.apache.avro', module: 'avro'
       exclude group: 'org.apache.arrow'
+      exclude group: 'junit'
     }
   }
 
@@ -1165,7 +1171,7 @@ project(':iceberg-spark3-runtime') {
     }
 
     integrationImplementation 
"org.apache.spark:spark-hive_2.12:${project.ext.Spark30Version}"
-    integrationImplementation 'junit:junit'
+    integrationImplementation 'org.junit.vintage:junit-vintage-engine'
     integrationImplementation 'org.slf4j:slf4j-simple'
     integrationImplementation project(path: ':iceberg-api', configuration: 
'testArtifacts')
     integrationImplementation project(path: ':iceberg-hive-metastore', 
configuration: 'testArtifacts')
diff --git a/versions.props b/versions.props
index bd1116b..d2bafd8 100644
--- a/versions.props
+++ b/versions.props
@@ -23,7 +23,8 @@ javax.ws.rs:javax.ws.rs-api = 2.1.1
 io.quarkus:* = 1.13.1.Final
 
 # test deps
-junit:junit = 4.12
+org.junit.vintage:junit-vintage-engine = 5.7.2
+org.junit.jupiter:junit-jupiter = 5.7.2
 org.mockito:mockito-core = 3.7.7
 org.apache.hive:hive-exec = 2.3.8
 org.apache.hive:hive-service = 2.3.8