From c758b7236fc2770dda352cd903fd4ba83bcef1bd Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 18 Jul 2019 21:50:58 +0200
Subject: [PATCH] use junit platform by default (#152)

---
 api/build.gradle                                |  5 ++++-
 app/build.gradle                                |  4 ++++
 build.gradle                                    | 16 ++++++++++------
 client/build.gradle                             |  5 ++++-
 examples/plugin/build.gradle                    |  5 ++++-
 plugins/dynamodb-positions-storage/build.gradle |  4 ----
 plugins/inmemory-positions-storage/build.gradle |  4 ----
 plugins/inmemory-records-storage/build.gradle   |  4 ----
 plugins/kafka-records-storage/build.gradle      |  4 ----
 plugins/pulsar-records-storage/build.gradle     |  8 --------
 plugins/redis-positions-storage/build.gradle    |  4 ----
 plugins/schema/build.gradle                     |  4 ----
 testing/build.gradle                            |  4 ++++
 13 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/api/build.gradle b/api/build.gradle
index 537abfdc..a101ea26 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,6 +1,9 @@
-
 sourceCompatibility = targetCompatibility = 8
 
+test {
+    useJUnit()
+}
+
 dependencies {
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
diff --git a/app/build.gradle b/app/build.gradle
index 025818e3..61eaa631 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,9 @@
 apply plugin: 'org.springframework.boot'
 
+test {
+    useJUnit()
+}
+
 dependencies {
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
diff --git a/build.gradle b/build.gradle
index 5cd1235e..996416bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,13 +37,17 @@ configure(subprojects.findAll { !it.name.startsWith("examples/") }) {
     apply plugin: 'java'
     apply from: "$rootDir/gradle/rerunTests.gradle"
 
-    sourceCompatibility = targetCompatibility = 10
+    sourceCompatibility = targetCompatibility = 11
 
-    test.testLogging {
-        displayGranularity 1
-        showStackTraces = true
-        exceptionFormat = 'full'
-        events "STARTED", "PASSED", "FAILED", "SKIPPED"
+    test {
+        useJUnitPlatform()
+
+        testLogging {
+            displayGranularity 1
+            showStackTraces = true
+            exceptionFormat = 'full'
+            events "STARTED", "PASSED", "FAILED", "SKIPPED"
+        }
     }
 
     project.afterEvaluate {
diff --git a/client/build.gradle b/client/build.gradle
index 6a31b9da..612bab61 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -1,6 +1,9 @@
-
 sourceCompatibility = targetCompatibility = 8
 
+test {
+    useJUnit()
+}
+
 dependencies {
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
diff --git a/examples/plugin/build.gradle b/examples/plugin/build.gradle
index efb11354..8a2b736a 100644
--- a/examples/plugin/build.gradle
+++ b/examples/plugin/build.gradle
@@ -3,9 +3,12 @@ plugins {
     id "io.spring.dependency-management"
 }
 
-
 sourceCompatibility = targetCompatibility = 8
 
+test {
+    useJUnit()
+}
+
 jar {
     baseName = "example-plugin"
     manifest {
diff --git a/plugins/dynamodb-positions-storage/build.gradle b/plugins/dynamodb-positions-storage/build.gradle
index e3c44703..86b16336 100644
--- a/plugins/dynamodb-positions-storage/build.gradle
+++ b/plugins/dynamodb-positions-storage/build.gradle
@@ -1,7 +1,3 @@
-test {
-    useJUnitPlatform()
-}
-
 jar {
     manifest {
         attributes(
diff --git a/plugins/inmemory-positions-storage/build.gradle b/plugins/inmemory-positions-storage/build.gradle
index 207d0ad3..e2c9f519 100644
--- a/plugins/inmemory-positions-storage/build.gradle
+++ b/plugins/inmemory-positions-storage/build.gradle
@@ -1,7 +1,3 @@
-test {
-    useJUnitPlatform()
-}
-
 jar {
     manifest {
         attributes(
diff --git a/plugins/inmemory-records-storage/build.gradle b/plugins/inmemory-records-storage/build.gradle
index cc4758c0..9e639362 100644
--- a/plugins/inmemory-records-storage/build.gradle
+++ b/plugins/inmemory-records-storage/build.gradle
@@ -1,7 +1,3 @@
-test {
-    useJUnitPlatform()
-}
-
 jar {
     manifest {
         attributes(
diff --git a/plugins/kafka-records-storage/build.gradle b/plugins/kafka-records-storage/build.gradle
index 09e16fb5..2693a5b2 100644
--- a/plugins/kafka-records-storage/build.gradle
+++ b/plugins/kafka-records-storage/build.gradle
@@ -1,7 +1,3 @@
-test {
-    useJUnitPlatform()
-}
-
 jar {
     manifest {
         attributes(
diff --git a/plugins/pulsar-records-storage/build.gradle b/plugins/pulsar-records-storage/build.gradle
index 361b027a..ae9a2f2b 100644
--- a/plugins/pulsar-records-storage/build.gradle
+++ b/plugins/pulsar-records-storage/build.gradle
@@ -1,11 +1,3 @@
-plugins {
-    id "java"
-}
-
-test {
-    useJUnitPlatform()
-}
-
 jar {
     manifest {
         attributes(
diff --git a/plugins/redis-positions-storage/build.gradle b/plugins/redis-positions-storage/build.gradle
index 7d448d61..23062cab 100644
--- a/plugins/redis-positions-storage/build.gradle
+++ b/plugins/redis-positions-storage/build.gradle
@@ -1,7 +1,3 @@
-test {
-    useJUnitPlatform()
-}
-
 jar {
     manifest {
         attributes(
diff --git a/plugins/schema/build.gradle b/plugins/schema/build.gradle
index ac6ccaa4..b209a258 100644
--- a/plugins/schema/build.gradle
+++ b/plugins/schema/build.gradle
@@ -1,7 +1,3 @@
-test {
-    useJUnitPlatform()
-}
-
 jar {
     manifest {
         attributes(
diff --git a/testing/build.gradle b/testing/build.gradle
index f8f2f67a..430c2732 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -1,3 +1,7 @@
+test {
+    useJUnit()
+}
+
 dependencies {
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'