From 6e0e5028a314a8a039a3472258d8ae81eaea466b Mon Sep 17 00:00:00 2001
From: Alva Swanson <alvasw@protonmail.com>
Date: Mon, 8 May 2023 09:12:09 +0200
Subject: [PATCH] Move JUnit dependency definition to bisq.java-conventions

---
 assets/build.gradle                                       | 1 -
 .../commons/src/main/groovy/bisq.java-conventions.gradle  | 5 +++++
 build.gradle                                              | 8 --------
 cli/build.gradle                                          | 2 --
 daemon/build.gradle                                       | 2 --
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/assets/build.gradle b/assets/build.gradle
index 032f1b9a7d..014b714a26 100644
--- a/assets/build.gradle
+++ b/assets/build.gradle
@@ -16,5 +16,4 @@ dependencies {
     implementation libs.apache.commons.lang3
     implementation libs.slf4j.api
     testImplementation libs.hamcrest
-    testImplementation libs.junit.jupiter.api
 }
diff --git a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
index e1aa1fc20f..9d706fa97c 100644
--- a/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
+++ b/build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
@@ -18,3 +18,8 @@ repositories {
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
+
+dependencies {
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.params
+}
diff --git a/build.gradle b/build.gradle
index 7cfd85f55a..f5c7bf0ced 100644
--- a/build.gradle
+++ b/build.gradle
@@ -160,7 +160,6 @@ configure(project(':common')) {
         implementation libs.jetbrains.annotations
         implementation libs.slf4j.api
         testImplementation libs.hamcrest
-        testImplementation libs.junit.jupiter.api
         runtimeOnly(libs.grpc.netty.shaded) {
             exclude(module: 'animal-sniffer-annotations')
             exclude(module: 'guava')
@@ -213,8 +212,6 @@ configure(project(':p2p')) {
         testImplementation libs.logback.core
         testImplementation libs.apache.commons.lang3
         testImplementation libs.mockito
-        testImplementation libs.junit.jupiter.api
-        testImplementation libs.junit.jupiter.params
     }
 }
 
@@ -284,7 +281,6 @@ configure(project(':core')) {
         testImplementation libs.natpryce.make.it.easy
         testImplementation libs.hamcrest
         testImplementation libs.mockito
-        testImplementation libs.junit.jupiter.api
     }
 
     test {
@@ -362,7 +358,6 @@ configure(project(':desktop')) {
         testImplementation libs.natpryce.make.it.easy
         testImplementation libs.mockito
         testImplementation libs.hamcrest
-        testImplementation libs.junit.jupiter.api
     }
 
     test {
@@ -397,7 +392,6 @@ configure(project(':seednode')) {
             exclude(module: 'guava')
         }
         testImplementation libs.mockito
-        testImplementation libs.junit.jupiter.api
     }
 }
 
@@ -516,8 +510,6 @@ configure(project(':apitest')) {
         }
         testAnnotationProcessor libs.lombok
         testCompileOnly libs.lombok
-        testImplementation libs.junit.jupiter.api
-        testImplementation libs.junit.jupiter.params
         testRuntimeOnly libs.javax.annotation
         testRuntimeOnly(libs.junit.jupiter.engine)
     }
diff --git a/cli/build.gradle b/cli/build.gradle
index 96b0710c24..c9a71520fb 100644
--- a/cli/build.gradle
+++ b/cli/build.gradle
@@ -32,8 +32,6 @@ dependencies {
     testCompileOnly libs.lombok
     testImplementation libs.cowwoc.diff.match.patch
 
-    testImplementation libs.junit.jupiter.api
-    testImplementation libs.junit.jupiter.params
     testRuntimeOnly libs.javax.annotation
     testRuntimeOnly libs.junit.jupiter.engine
 }
diff --git a/daemon/build.gradle b/daemon/build.gradle
index 492e71c252..e93fb0c709 100644
--- a/daemon/build.gradle
+++ b/daemon/build.gradle
@@ -48,7 +48,5 @@ dependencies {
     }
     testAnnotationProcessor libs.lombok
     testCompileOnly libs.lombok
-    testImplementation libs.junit.jupiter.api
-    testImplementation libs.junit.jupiter.params
     testRuntimeOnly(libs.junit.jupiter.engine)
 }