From 1db156f90ec2321ee759dfdc2a85487348583d34 Mon Sep 17 00:00:00 2001 From: codingsemen Date: Wed, 21 May 2025 08:55:27 +0200 Subject: [PATCH 1/2] feat: add in junit pioneer for testing --- sda-commons-dependencies/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sda-commons-dependencies/build.gradle b/sda-commons-dependencies/build.gradle index 418d15a9..5b43745f 100644 --- a/sda-commons-dependencies/build.gradle +++ b/sda-commons-dependencies/build.gradle @@ -37,6 +37,8 @@ dependencies { // overall testing dependencies api 'org.awaitility:awaitility:4.3.0' + api "org.junit-pioneer:junit-pioneer:2.3.0" + // spring cloud api 'org.apache.httpcomponents:httpclient:4.5.14', { because 'conflict spring cloud (4.5.4 via maven resolver) and spring-cloud-aws-s3 (4.5.13 via awssdk)' From 8fa839f3534ad783602a9e8e3ca24ed77140ea82 Mon Sep 17 00:00:00 2001 From: codingsemen Date: Wed, 21 May 2025 11:58:58 +0200 Subject: [PATCH 2/2] fix version conflict fix typo fix unused dependency version declaration --- sda-commons-dependencies/build.gradle | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sda-commons-dependencies/build.gradle b/sda-commons-dependencies/build.gradle index 5b43745f..6a0a60a0 100644 --- a/sda-commons-dependencies/build.gradle +++ b/sda-commons-dependencies/build.gradle @@ -7,7 +7,6 @@ javaPlatform { } ext { - awaitalityVersion = '4.2.0' bouncycastleVersion = '1.80' logbackContribVersion = '0.1.5' springBootVersion = '3.4.5' @@ -37,7 +36,11 @@ dependencies { // overall testing dependencies api 'org.awaitility:awaitility:4.3.0' - api "org.junit-pioneer:junit-pioneer:2.3.0" + api 'org.junit-pioneer:junit-pioneer:2.3.0' + + api 'org.junit:junit-bom:5.11.4', { + because 'conflict junit-pioneer and spring-boot-starter-test' + } // spring cloud api 'org.apache.httpcomponents:httpclient:4.5.14', { @@ -85,7 +88,7 @@ dependencies { because 'conflict between com.fasterxml.jackson.module:jackson-module-scala_2.13:2.13.3, com.typesafe.scala-logging:scala-logging_2.13:3.9.3 and org.scala-lang.modules:scala-collection-compat_2.13:2.4.4' } api "org.apache.zookeeper:zookeeper:3.9.3", { - because 'version conflict in transitive managed depedencies' + because 'version conflict in transitive managed dependencies' } // sda-commons-starter-s3